From 7bab7445a9d7875e5f6cba0e9d7d9c0091ea9ae3 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Thu, 14 Feb 2008 05:07:55 +0100
Subject: [PATCH 01/36] corr. IRC protocol

---
 .gitignore      |  1 +
 wiki/index.html | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef277c1a1..5dc912d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .[^.]*
 *.os
 *.gch
+,valgrind.log*
 Buildhelper.pyc
 optcache
 Makefile.in
diff --git a/wiki/index.html b/wiki/index.html
index 43202dd25..34493fc01 100755
--- a/wiki/index.html
+++ b/wiki/index.html
@@ -1032,7 +1032,7 @@ cinelerra3/mob is an anonymous account at pipapo.org where everyone can commit c
 * on the question who decides what to do after a cache miss, we tend to put the decision into the render node (because this seems to be the simpler aproach), but still have to work out the details.
 </pre>
 </div>
-<div title="IRC_2008-02-01" modifier="Ichthyostega" modified="200802030342" created="200802021821" tags="irclog" changecount="20">
+<div title="IRC_2008-02-01" modifier="Ichthyostega" modified="200802031846" created="200802021821" tags="irclog" changecount="28">
 <pre>! 1. feb.2008 on #openvideo
 21:00 -23:30 GMT. __Participants__:
 * hermanr
@@ -1047,17 +1047,18 @@ cinelerra3/mob is an anonymous account at pipapo.org where everyone can commit c
 * Velmont
 
 !! Discuss the open points in http://www.pipapo.org/pipawiki/Cinelerra3/DesignProcess &amp;mdash; do we need this formalism?
-At start of the project last summer, Cehteh made a [[design process proposal|http://www.pipapo.org/pipawiki/Cinelerra3/DesignProcess]]. We will keeping this up, not for every implementation detail, but for mayor plans, wishes and design decisions. One point in the agenda of future meetings will be to work through proposals in the queue
+At start of the project last summer, Cehteh made a [[design process proposal|http://www.pipapo.org/pipawiki/Cinelerra3/DesignProcess]]. We will keeping this up, not for every implementation detail, but for major plans, wishes and design decisions. One point in the agenda of future meetings will be to work through proposals in the queue
 * proposals in the &quot;idea&quot; state are not complete, can be just brainstorming or need further discussion. Comments please to the proposal page.
 * proposals in the &quot;draft&quot; state are ready for conclusive discussion and will be treated in one of the next meetings
 * &quot;final&quot; proposals are either &quot;accepted&quot; or &quot;dropped&quot;. We don't differentiate the latter, but should write a short note why it was dropped.
+* if there is need for more or finer grained categories, we'll extend the page and the template as needed or provide different views
 
 !! The development model
 We employ a distributed model based on GIT. We want this repository to be as complete as possible, including documentation in embedded ~TiddlyWikis and Bug reports. Each dev has its own GIT repo, devs are pulling from each other, they are free to cherry pick and try to make the combined version work. Point is that everyone can clone the git, negotiate with the others what s(he) wants to do, and hack on. Every dev signs off his branch with an standardized signature. For small changes we provide a &quot;Mob GIT&quot;, i.e. anonymously pushable git (which is untrusted of course). Cehteh is currently working on a git web frontend which makes the codebase in the mob-repo web-editable like a wiki.
 Will we need a stable version or an official branch?  not yet &amp;mdash; as long as the team is small it will work more painless without. At some point, when the project is more mature, we will define an official branch. Later on we will have automated builds and regression test runs. As we do test-driven development anyways, it's just a question of someone setting up all the infrastructure, then we'll do it.
 Ichthyo proposes a new requirement: All devs should ensure the &quot;master&quot; branch of their respective repositories always passes the compiler and the test suite. ~Work-In-Progress should be done on branches. Rationale: it is sufficient to pull from the master branches, and you can be sure the version you pulled worked for the originator.
-A note on dependencies: it will be hard to target minimal dependencies for such a project, but we shall try not bloat it unnecessarily. Sometimes it can be sensible to rather re-invent a feature &amp;mdash; esp. when it fits into the core focus of the project &amp;mdash; instead of depending on difficult to build and not sufficiently maintained external project. But we should avoid reinventing things like GUI toolkits.
-And, pretty much obvious, we try to stick to modern programming standards. That means, modules have interfaces, interfaces need some (minimal) documentation, and it is not allowed to bypass the interfaces and tangle everything in a wild fashion.
+A note on dependencies: it will be hard to target minimal dependencies for such a project, but we shall try not to bloat it unnecessarily. Sometimes it can be sensible to rather re-invent a feature &amp;mdash; esp. when it fits into the core focus of the project &amp;mdash; instead of depending on difficult to build and not sufficiently maintained external projects. But we should avoid reinventing things like GUI toolkits.
+And, pretty much obvious, we try to stick to modern programming standards. Read: modules have interfaces, interfaces need some (minimal) documentation, and it is not allowed to bypass the interfaces and tangle everything in a wild fashion.
 Currently, the project can be separated into three layers, which could evolve into sub-projects: Backend, ~Proc-Layer, GUI. For each part, the dev most deeply involved and most knowledgeable will take on the sometimes necessary leadership and have the last word in case of quarrels. Currently, Cehteh cares for the Backend and Ichthyo headed for the ~Proc-Layer. We have postponed any work on the GUI for now and don't participate in GUI toolkit discussions. If there is a dev willing to care for the GUI, collect proposals, care for usability and the users needs and finally code it up, then he will the one to decide what toolkit to use.
 We plan to make the discussion about GPL v3 a point on the agenda of the next meeting.
 
@@ -1067,25 +1068,28 @@ We plan to make the discussion about GPL v3 a point on the agenda of the next me
 * write a short status report for each mayor part //prior// to the meeting (saves us time). Maybe add an TODO list there
 * go through the open issues for the design process drafts
 * publish a protocol of each meeting on the (~Cinelerra-CV, ~LibOpenvideo) Mailinglists, in the TiddlyWiki and on pipapo.org
+* News, Protocols and the agenda of the next meeting can be found at the [[pipawiki-page|http://www.pipapo.org/pipawiki/Cinelerra3/MonthlyMeetings]]
 * next meeting on first Thursday in March (6.3.2008)
 
 !! Who works on what, what are the short term goals, what tasks are open?
 ''Ichthyo'' works on the processing layer. Current goal is to get the core of the builder fleshed out. Next goal is to create a clip object (dummy), add it to the EDL, hand the EDL over to the builder and let the builder make the first (preliminary) render nodes. (note: left many details for later).
-Ichthyo started coding his design draft and things seem to work out as intended. Some Keywords: Have a high-level model and a low level model. The former are the objects in the Session edited by the user, the latter is a network of completely configured render nodes, employing the same pull model as in Cinelerra-2. In between sits the Builder, translating high-level into low-level. This translation is done on demand (not for every frame).
+Ichthyo started coding his design draft and things seem to work out as intended. Some Keywords: Have a high-level model and a low level model. The former is comprised of the objects in the Session edited by the user, the latter is a network of completely configured render nodes, employing the same pull model as in Cinelerra-2. In between sits the Builder, translating high-level into low-level. This translation is done on demand (not for every frame).
 Current state in this part is: basic asset manager is done, asset objects (forming a hierarchy) can be created and will be registered automatically, it is possible to create a clip-&quot;~MediaObject&quot; from a media asset (without caring for any details regarding multichannel clips). Some support lib components are written, Session and data holders start up on demand and shutdown cleanly. The test suite is the only interesting executable, and this will remain so for quite some time. Currently writing the first parts of the Builder.
 Further plans/ideas: Ichthyo is rather determined to embed a Prolog interpreter (YAP Prolog) to handle all sorts of configuration queries in a rule-driven fashion. Things Ichthyo can't do in the near future: caring for session loading/saving serialisation plus storage backends, caring for a DB based implementation of the asset manager and integration with production support software, target the scheduler which will receive any edit operations initiated from the GUI.
 
 ''Cehteh'' is currently working on webgit, which is somewhat related inasmuch it will make small contributions to the mob repository much simpler. Previously he started with some foundation and support facilities. He plans to come back to the Backend implementation in about two weeks. The Backend is intended to handle all media (and even meta-)data as generalized frames. The render nodes network created by the ~Proc-Layer is completely stateless and all data is served from below. While it will be possible to address and access individual data within a frame (e.g. audio samples), frames are the smallest unit for memory and cache management. No plans to use a tiled memory model or to support frames larger than aprox. 20-40% of the available RAM.
-Cehteh's design plan includes a scheduler to organize the access to the raw data, monitor the timings and prefetch data as needed. This scheduler will be configurable via quality preferences (&quot;need realtime&quot;, &quot;need perfect quality&quot;). Further, there will be an elaborate caching scheme trying hard to avoid re-rendering any frames already calculated previously. Temporary data will be backed by files and thus swapped out &amp;mdash; this swapout and size of temporary data is to be monitored and adjusted on load &amp;mdash; and all temporary data is kept as most-recent-used cache discipline. Incoming and outgoing footage shall mostly be handled by using mmaped buffers. The rationale is to avoid unnecessary copy from kernel to user space and wasting memory for an additional in-kernel buffer. Writing via a mmapped buffer is little more tricky; there will be a in-place writing which is used for indices and other precalculated data which needs updates, and the processing layer can query write buffers which are actually a small cache/ring and then comited to the file. Basically, mmapping is a clean solution if you can design for it, and it's portable (posix)
+Cehteh's design plan includes a scheduler to organize the access to the raw data, monitor the timings and prefetch data as needed. This scheduler will be configurable via quality preferences (&quot;need realtime&quot;, &quot;need perfect quality&quot;). Further, there will be an elaborate caching scheme trying hard to avoid re-rendering any frames already calculated previously. Temporary data will be backed by files and thus swapped out &amp;mdash; this swapout and size of temporary data is to be monitored and adjusted according to the current load &amp;mdash; and all temporary data is kept as most-recent-used cache discipline. Incoming and outgoing footage shall mostly be handled by using mmaped buffers. The rationale is to avoid unnecessary copy from kernel to user space and wasting memory for an additional in-kernel buffer. Writing via a mmapped buffer is little more tricky; there will be a in-place writing which is used for indices and other precalculated data which needs updates, and the processing layer can query write buffers which are actually a small cache/ring and then comited to the file. Basically, mmapping is a clean solution if you can design for it, and it's portable (posix)
 Things to do: object serialisation backend is sometime on Cehteh's schedule, but that's ahead and if someone else helps or takes over it would be OK. Even more true for a DB based backend for the asset manager.
 
+''Gmerlin'' plans to implement grayscale support for GAVL, so the upper layers can store arbitrary data in it.
+
 __about multithreading__: since the render nodes are stateless they can be driven in multiple threads (but inter frame dependencies need to be resolved/serialized). Mostly the backend manages threads and does that quite conservatively (compared to Cinelerra-2 which massively creates separate threads for small tasks). Any edit operations initiated from GUI go to a scheduler in the middle layer, which enqueues and effectively serializes operations done to the &quot;media objects&quot; in the high-level model. The editing operations themselves are //not threadsafe // by design, they rely on being scheduled correctly. The builder is triggered from this ~Proc-Layer scheduler and starts in one separate thread, and when done, we swap whole parts of the render nodes network and then the backend can re(start) rendering as needed.
 
 !!The naming discussion
 The discussion looks healthy so far... People can add new proposals on the [[pipawiki|http://www.pipapo.org/pipawiki/Cinelerra3/Names]]. intersting names are still coming in, so we should just let the name-choosing game go on for a while. And, btw, we //can// depart from beeing similar to &quot;Cinelerra&quot; ;-) 
 Let's say, we need a person volonteering to guide/moderate the selection, going over the list and scratching inammprobiate ones. Criteria for good names being:
 * should not be an existing project
-* should be &quot;googeable&quot;
+* should be &quot;googleable&quot;
 * should not be offensive
 * should have one of the free top level domains (.net, .org)
 * should be compatible with educational institutions (sorry, no pr0nedit :)

From 113678ff9324ad45836b354de4e58c473017232d Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 15 Feb 2008 02:56:25 +0100
Subject: [PATCH 02/36] some refacturing of the (preliminary) struct asset
 impl...

---
 doc/devel/.gitignore                 |  2 +
 src/proc/asset/procpatt.cpp          | 56 ++++++++++------------------
 src/proc/asset/procpatt.hpp          |  6 +--
 src/proc/asset/struct.cpp            | 25 +++++++++++++
 src/proc/asset/struct.hpp            |  3 ++
 src/proc/asset/structfactoryimpl.hpp |  4 +-
 6 files changed, 55 insertions(+), 41 deletions(-)
 create mode 100644 doc/devel/.gitignore

diff --git a/doc/devel/.gitignore b/doc/devel/.gitignore
new file mode 100644
index 000000000..96886436c
--- /dev/null
+++ b/doc/devel/.gitignore
@@ -0,0 +1,2 @@
+,doxylog
+html/*
diff --git a/src/proc/asset/procpatt.cpp b/src/proc/asset/procpatt.cpp
index ec9ecb781..f7ce8895d 100644
--- a/src/proc/asset/procpatt.cpp
+++ b/src/proc/asset/procpatt.cpp
@@ -32,46 +32,26 @@ using util::isnil;
 namespace asset
   {
   
-  namespace // ProcPattern implementation details
-    {
-      /** @internal derive a sensible asset ident tuple when creating 
-       *  a processing pattern asset based on a query
-       *  @todo define the actual naming scheme of struct assets
-       */
-      const Asset::Ident
-      createPatternIdent (const string& properties)
-        {
-          string name ("pattern-" + properties);  // TODO something sensible here; append number, sanitize etc.
-          TODO ("Implement ProcPatt name scheme!!");
-          Category category (STRUCT,"patterns");
-          return Asset::Ident (name, category );
-        }
-    } 
   
-  /** */
-  ProcPatt::ProcPatt (const string& properties)
-    : Struct (createPatternIdent (properties)),
-      propDescriptor_ (properties)
+  /** new processing pattern with empty instruction list.
+   *  @todo preliminary implementation, storing the capabilities
+   *        in the asset name field. We can do better, when
+   *        it's clear what capabilities we need
+   */
+  ProcPatt::ProcPatt (const Asset::Ident& idi)
+    : Struct (idi),
+      instructions_()
+  { }
+  
+  
+  /** @internal used for creating a clone copy */
+  ProcPatt::ProcPatt (const Asset::Ident& idi, const InstructionSequence& instru)
+    : Struct (idi),
+      instructions_(instru)
   {
     TODO ("verify building instructions, maybe preprocess...");
   }
-
-  /** @internal used for creating a clone */
-  ProcPatt::ProcPatt (const string& props, const InstructionSequence& instructs)
-    : Struct (createPatternIdent (props)),
-      propDescriptor_ (props),
-      instructions_ (instructs)
-  { }
-
   
-  /** query the currently defined properties of this
-      processing pattern for a stream-ID predicate */
-  const string& 
-  ProcPatt::queryStreamID()  const
-  {
-    TODO ("really implement querying the properties");
-    return propDescriptor_; /////////////////////////////TODO grober Unfug
-  }
   
   
   /** create a new ProcPatt asset as a literal copy
@@ -84,7 +64,11 @@ namespace asset
   ProcPatt::newCopy (string newID)  const
   {
     TODO ("implement the Pattern-ID within the propDescriptor!");
-    ProcPatt* pP = new ProcPatt (this->propDescriptor_, this->instructions_);
+    TODO ("implement a consitent struct asset naming scheme at one central location!!!!!");
+    const Asset::Ident newIdi ( this->ident.name+".X"
+                              , this->ident.category
+                              );
+    ProcPatt* pP = new ProcPatt (newIdi, this->instructions_);
     return AssetManager::instance().wrap (*pP);
   }
   
diff --git a/src/proc/asset/procpatt.hpp b/src/proc/asset/procpatt.hpp
index 5cd22e1e1..593c57a0f 100644
--- a/src/proc/asset/procpatt.hpp
+++ b/src/proc/asset/procpatt.hpp
@@ -52,17 +52,15 @@ namespace asset
    */
   class ProcPatt : public Struct
     {
-      string propDescriptor_;
       InstructionSequence instructions_;
       
-      ProcPatt (const string& props, const InstructionSequence& instructs);
+      ProcPatt (const Asset::Ident&, const InstructionSequence&);      
       
     protected:
-      explicit ProcPatt (const string& propDescriptor);
+      explicit ProcPatt (const Asset::Ident& idi);
       friend class StructFactoryImpl;
       
     public:
-      const string& queryStreamID()  const;
       shared_ptr<ProcPatt> newCopy (string newID) const;
       
       ProcPatt& attach (Symbol where, PProc& node);
diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp
index 729da826a..47586202a 100644
--- a/src/proc/asset/struct.cpp
+++ b/src/proc/asset/struct.cpp
@@ -34,6 +34,12 @@
 #include "common/util.hpp"
 #include "nobugcfg.h"
 
+#include <boost/regex.hpp>
+
+using boost::regex;
+using boost::smatch;
+using boost::regex_search;
+
 using mobject::Session;
 using cinelerra::query::normalizeID;
 
@@ -47,6 +53,25 @@ namespace asset
   
   /****** NOTE: not really implemented yet. What follows is partially a hack to build simple tests *******/
 
+  namespace // Implementation details
+    {
+    regex streamID_pattern("stream\\(\\s*(\\w+)\\s*\\)");
+  } 
+  
+  
+  
+  /** query the currently defined properties of this
+      structural asset for a stream-ID predicate */
+  const string
+  Struct::queryStreamID()  const
+  {
+    smatch match;
+    
+    if (regex_search (this->ident.name, match, streamID_pattern))
+      return string (match[1]);
+    else
+      return "";
+  }
 
   
   
diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp
index e9cb9de7d..4beb5479e 100644
--- a/src/proc/asset/struct.hpp
+++ b/src/proc/asset/struct.hpp
@@ -84,6 +84,9 @@ namespace asset
           return static_cast<const ID<Struct>& > (Asset::getID()); 
         }
       
+      const string queryStreamID()  const;
+      
+      
     protected:
       Struct (const Asset::Ident& idi) : Asset(idi) {}
       friend class StructFactory;
diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp
index 506baea83..a1086a9fa 100644
--- a/src/proc/asset/structfactoryimpl.hpp
+++ b/src/proc/asset/structfactoryimpl.hpp
@@ -84,7 +84,9 @@ namespace asset
       const Asset::Ident
       createIdent (const Query<STRU>& query)
         {
-          string name (Traits<STRU>::namePrefix + query);  // TODO something sensible here; append number, sanitize etc.
+          static int i=0;
+          static format namePattern ("%s%d-%s"); // TODO finally just use the capability string as name??
+          string name = str(namePattern % Traits<STRU>::namePrefix % (++i) %  query);
           TODO ("struct asset naming scheme??");
           Category cat (STRUCT, Traits<STRU>::catFolder);
           return Asset::Ident (name, cat );

From 34b14a226ea9f40afea8c9007a23be32d393e9e6 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 16 Feb 2008 02:47:01 +0100
Subject: [PATCH 03/36] defer creation of the empty default sesison, avoids
 running complex code in static initialisation

---
 src/proc/mobject/session.hpp                 |  4 ++
 src/proc/mobject/session/sessionimpl.hpp     |  2 +-
 src/proc/mobject/session/sessmanagerimpl.cpp | 49 ++++++++++++++++----
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp
index 149dc6c82..d8b89d16c 100644
--- a/src/proc/mobject/session.hpp
+++ b/src/proc/mobject/session.hpp
@@ -141,6 +141,10 @@ namespace mobject
         virtual ~SessManager() {};
       };
 
+      
+      CINELERRA_ERROR_DECLARE (CREATE_SESSION);  ///< unable to create basic session.
+
+
   } // namespace mobject::session
 
 } // namespace mobject
diff --git a/src/proc/mobject/session/sessionimpl.hpp b/src/proc/mobject/session/sessionimpl.hpp
index d9dc1f078..38448ac41 100644
--- a/src/proc/mobject/session/sessionimpl.hpp
+++ b/src/proc/mobject/session/sessionimpl.hpp
@@ -98,7 +98,7 @@ namespace mobject
         virtual void reset () ;
         virtual void load ()  ;
         virtual void save ()  ;
-        virtual Session* operator-> ()  throw() { return pImpl_.get(); }
+        virtual SessionImpl* operator-> ()  throw() ;
       };
 
       
diff --git a/src/proc/mobject/session/sessmanagerimpl.cpp b/src/proc/mobject/session/sessmanagerimpl.cpp
index ca2797151..ad94c9949 100644
--- a/src/proc/mobject/session/sessmanagerimpl.cpp
+++ b/src/proc/mobject/session/sessmanagerimpl.cpp
@@ -39,6 +39,7 @@
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/sessionimpl.hpp"
 #include "proc/mobject/session/defsmanager.hpp"
+#include "common/error.hpp"
 
 using boost::scoped_ptr;
 
@@ -48,17 +49,49 @@ namespace mobject
   {
   namespace session
     {
+    
+    CINELERRA_ERROR_DEFINE (CREATE_SESSION, "unable to create basic session");
+    
+    /** Access to the "current session", which actually is
+     *  an SessionImpl instance. This session object is created 
+     *  either by loading an existing session, or on demand by
+     *  this accessor function here (when no session was loaded
+     *  or created)
+     *  @note any exceptions arising while building the basic
+     *        session object(s) will halt the system.
+     */
+    SessionImpl* 
+    SessManagerImpl::operator-> ()  throw() 
+    { 
+      if (!pImpl_)
+        try
+          { // create empty default configured session
+            this->reset();
+          }
+        catch (...)
+          {
+            ERROR (oper, "Unrecoverable Failure while creating the empty default session.");
+            throw cinelerra::error::Fatal ( "Failure while creating the basic session object. Sysstem halted." 
+                                          , CINELERRA_ERROR_CREATE_SESSION );
+          }
 
-    /** Besides creating the single system-wide Session manger instance,
-     *  creates an empty default Session as well.
-     *  @note any exceptions arising in the course of this will halt
-     *        the system (and this behaviour is desirable).
+          
+      return pImpl_.get();
+    }
+
+    
+    
+    /** Initially (at static init time), only the single system-wide 
+     *  Session manger instance is created. It can be used to load an
+     *  existing session; otherwise an empty default Session an a
+     *  Defaults manager (Config Query system) is created at first
+     *  \link #operator-> access \endlink to the sesion object.
      */
     SessManagerImpl::SessManagerImpl ()  throw()
-      : pDefs_ (new DefsManager),
-        pImpl_ (new SessionImpl (*pDefs_))
-    {
-    }
+      : pDefs_ (0),
+        pImpl_ (0)
+    { }
+    
 
     /** @note no transactional behaviour. 
      *        may succeed partial.

From ea0416881e9c891eff4fe3142fd62cbc64c2bee3 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 18 Feb 2008 04:16:53 +0100
Subject: [PATCH 04/36] WIP towards a asset::Struct naming scheme

---
 src/common/query.cpp                          | 37 +++++++++++
 src/common/query.hpp                          |  9 ++-
 src/common/query/mockconfigrules.cpp          | 18 +++++-
 src/proc/asset/pipe.cpp                       | 35 +++++------
 src/proc/asset/pipe.hpp                       |  4 +-
 src/proc/asset/struct.cpp                     | 37 +++++------
 src/proc/asset/struct.hpp                     |  1 +
 src/proc/asset/structfactoryimpl.hpp          | 61 ++++++++++++-------
 tests/components/proc/asset/basicpipetest.cpp | 11 ++--
 9 files changed, 143 insertions(+), 70 deletions(-)

diff --git a/src/common/query.cpp b/src/common/query.cpp
index bb3e6ae86..152086bc3 100644
--- a/src/common/query.cpp
+++ b/src/common/query.cpp
@@ -26,10 +26,18 @@
 #include "nobugcfg.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/regex.hpp>
+#include <map>
 
+using std::map;
+using boost::regex;
+using boost::smatch;
+using boost::regex_search;
 using boost::algorithm::is_upper;
 using boost::algorithm::is_alpha;
 
+using util::contains;
+
 
 namespace cinelerra
   {
@@ -48,6 +56,35 @@ namespace cinelerra
       if (is_upper() (first))
         id[0] = std::tolower (first);
     }
+
+    
+    
+    
+    namespace // Implementation details
+      {
+      map<Symbol, regex> regexTable;
+    }
+    
+    /** (preliminary) helper: instead of really parsing and evaluating the terms,
+     *  just do a regular expression match to extract the literal argument 
+     *  behind the given predicate symbol. e.g calling
+     *  queryID ("stream", "id(abc), stream(mpeg)") 
+     *  yields "mpeg"
+     */
+    const string
+    extractID (Symbol sym, const string& termString)
+    {
+      
+      if (!contains (regexTable, sym))
+        regexTable[sym] = regex (string(sym)+="\\(\\s*([\\w_\\.\\-]+)\\s*\\)"); 
+      
+      smatch match;
+      if (regex_search (termString, match, regexTable[sym]))
+        return string (match[1]);
+      else
+        return "";
+    
+  } 
   
   } // namespace query
     
diff --git a/src/common/query.hpp b/src/common/query.hpp
index b5575f0da..9bdb3a389 100644
--- a/src/common/query.hpp
+++ b/src/common/query.hpp
@@ -28,11 +28,13 @@
 #include <string>
 #include <typeinfo>
 
+#include <boost/format.hpp>
 
 
 namespace cinelerra
   {
   using std::string;
+  using boost::format;
 
   /* ==== comon definitions for rule based queries ==== */
   
@@ -47,7 +49,9 @@ namespace cinelerra
   class Query : public std::string
     {
     public:
-      Query (const string& predicate="") : string(predicate) {}
+      explicit Query (const string& predicate="") : string(predicate) {}
+      explicit Query (format& pattern)            : string(str(pattern)) {}
+      
       
       const string asKey()  const
         {
@@ -65,6 +69,9 @@ namespace cinelerra
      */
     void normalizeID (string& id);
     
+    const string extractID (Symbol, const string& termString);
+
+    
   
   } // namespace query
     
diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp
index 52f7f93fd..54ba5aaf1 100644
--- a/src/common/query/mockconfigrules.cpp
+++ b/src/common/query/mockconfigrules.cpp
@@ -67,6 +67,14 @@ namespace cinelerra
         Ptr obj = Struct::create (query);
         return AnyPair(query.asKey(), obj);
       }
+      
+      /** shortcut for simply accessing a table entry */ 
+      template<class STRU, class PTAB>
+      any&
+      item (PTAB& table, const string& query)
+      {
+        return (*table)[Query<STRU>(query).asKey()];
+      }
     
     }
     
@@ -82,8 +90,16 @@ namespace cinelerra
       INFO (config, "creating mock answers for some config queries...");
       isInit_ = true; // allow re-entrance
       
+      typedef const ProcPatt cPP;
+      
       // for baiscpipetest.cpp ---------
-      answer_->insert (entry_Struct<const ProcPatt> ("stream(teststream)"));
+      answer_->insert (entry_Struct<cPP> ("stream(video)"));
+      answer_->insert (entry_Struct<cPP> ("stream(teststream)"));
+      item<cPP> (answer_, "stream(default)")  = item<cPP> (answer_,"stream(video)"); //TODO killme
+      
+      answer_->insert (entry_Struct<Pipe> ("pipe(master), stream(video)"));
+      item<Pipe> (answer_, "pipe(default)")   = item<Pipe>(answer_,"pipe(master), stream(video)"); //TODO killme
+      TODO ("remove the default entries!!!  DefaultsManager should find them automatically");
     }
 
     
diff --git a/src/proc/asset/pipe.cpp b/src/proc/asset/pipe.cpp
index e15a09254..78899e844 100644
--- a/src/proc/asset/pipe.cpp
+++ b/src/proc/asset/pipe.cpp
@@ -22,35 +22,30 @@
 
 
 #include "proc/asset/pipe.hpp"
+#include "common/util.hpp"
+
+using util::isnil;
 
 namespace asset
   {
   
-  namespace // Pipe Asset implementation details
-    {
-      /** @internal derive a sensible asset ident tuple when creating 
-       *  a pipe asset based on a query
-       *  @todo define the actual naming scheme of struct assets
-       */
-      const Asset::Ident
-      createPipeIdent (PProcPatt& wiring, string& id, wstring& shortD, wstring& longD)
-        {
-          string name ("pipe-" + id);  // TODO something sensible here; append number, sanitize etc.
-          TODO ("Implement pipe name scheme!!");
-          Category category (STRUCT,"pipes");
-          return Asset::Ident (name, category );
-        }
-    } 
   
   /** */
-  Pipe::Pipe (PProcPatt& wiring, string pipeID, wstring shortDesc, wstring longDesc) 
-    : Struct (createPipeIdent (wiring,pipeID,shortDesc,longDesc)),
+  Pipe::Pipe ( const Asset::Ident& idi
+             , PProcPatt& wiring
+             , const string& pipeID
+             , wstring shortName
+             , wstring longName
+             ) 
+    : Struct (idi),
       pipeID_ (pipeID),
       wiringTemplate(wiring),
-      shortDesc (shortDesc),
-      longDesc (longDesc)
+      shortDesc (shortName),
+      longDesc (longName)
   {
-    
+    REQUIRE (!isnil (pipeID));
+    if (isnil (shortDesc))
+      shortDesc = wstring (pipeID.begin(), pipeID.end());
   }
 
   
diff --git a/src/proc/asset/pipe.hpp b/src/proc/asset/pipe.hpp
index 0761efe65..ea354361d 100644
--- a/src/proc/asset/pipe.hpp
+++ b/src/proc/asset/pipe.hpp
@@ -52,7 +52,7 @@ namespace asset
    */
   class Pipe : public Struct
     {
-      string pipeID_;
+      const string pipeID_;
       PProcPatt wiringTemplate;
       
     public:
@@ -66,7 +66,7 @@ namespace asset
 
       
     protected:
-      Pipe (PProcPatt& wiring, string pipeID="", wstring shortDesc =wstring(), wstring longDesc =wstring()) ;
+      Pipe (const Asset::Ident&, PProcPatt& wiring, const string& pipeID, wstring shortName =wstring(), wstring longName =wstring()) ;
       friend class StructFactory;
       friend class StructFactoryImpl;
 
diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp
index 47586202a..bcaff3118 100644
--- a/src/proc/asset/struct.cpp
+++ b/src/proc/asset/struct.cpp
@@ -26,7 +26,6 @@
 #include "proc/asset/procpatt.hpp"
 #include "proc/asset/track.hpp"
 #include "proc/asset/pipe.hpp"
-#include "proc/mobject/session.hpp"
 #include "common/configrules.hpp"
 
 #include "proc/asset/structfactoryimpl.hpp"
@@ -34,18 +33,16 @@
 #include "common/util.hpp"
 #include "nobugcfg.h"
 
-#include <boost/regex.hpp>
+#include <boost/format.hpp>
 
-using boost::regex;
-using boost::smatch;
-using boost::regex_search;
+using boost::format;
 
-using mobject::Session;
+using cinelerra::Symbol;
 using cinelerra::query::normalizeID;
-
-using cinelerra::ConfigRules;
 using cinelerra::query::QueryHandler;
+using cinelerra::ConfigRules;
 
+using util::contains;
 
 
 namespace asset
@@ -53,11 +50,6 @@ namespace asset
   
   /****** NOTE: not really implemented yet. What follows is partially a hack to build simple tests *******/
 
-  namespace // Implementation details
-    {
-    regex streamID_pattern("stream\\(\\s*(\\w+)\\s*\\)");
-  } 
-  
   
   
   /** query the currently defined properties of this
@@ -65,12 +57,15 @@ namespace asset
   const string
   Struct::queryStreamID()  const
   {
-    smatch match;
-    
-    if (regex_search (this->ident.name, match, streamID_pattern))
-      return string (match[1]);
-    else
-      return "";
+    return cinelerra::query::extractID ("stream", this->ident.name);
+  }
+  
+  /** query the currently defined properties of this
+      structural asset for a stream-ID predicate */
+  const string
+  Struct::queryPipeID()  const
+  {
+    return cinelerra::query::extractID ("pipe", this->ident.name);
   }
 
   
@@ -126,8 +121,8 @@ namespace asset
   {
     normalizeID (pipeID);
     normalizeID (streamID);
-    PProcPatt processingPattern = Session::current->defaults (Query<const ProcPatt>("stream("+streamID+")"));
-    Pipe* pP = new Pipe (processingPattern, pipeID);
+    static format descriptor("pipe(%s), stream(%s).");
+    Pipe* pP = impl_->fabricate (Query<Pipe> (descriptor % pipeID % streamID));
     return AssetManager::instance().wrap (*pP);
   }
 
diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp
index 4beb5479e..ed6642690 100644
--- a/src/proc/asset/struct.hpp
+++ b/src/proc/asset/struct.hpp
@@ -85,6 +85,7 @@ namespace asset
         }
       
       const string queryStreamID()  const;
+      const string queryPipeID()    const;
       
       
     protected:
diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp
index a1086a9fa..3d78920d3 100644
--- a/src/proc/asset/structfactoryimpl.hpp
+++ b/src/proc/asset/structfactoryimpl.hpp
@@ -34,16 +34,22 @@
 #define ASSET_STRUCTFACTORYIMPL_H
 
 
+#include "proc/mobject/session.hpp"
 #include "common/configrules.hpp"
 #include "common/error.hpp"
+#include "common/util.hpp"
 
 #include <boost/format.hpp>
 
 using boost::format;
 
+using mobject::Session;
+
+using util::isnil;
+using util::contains;
 using asset::Query;
 using cinelerra::query::CINELERRA_ERROR_CAPABILITY_QUERY;
-
+using cinelerra::query::extractID;
 
 namespace asset
   {
@@ -54,16 +60,20 @@ namespace asset
     {
       static Symbol namePrefix;
       static Symbol catFolder;
+      static Symbol idSymbol;
     };
   
-  template<> Symbol Traits<Track>::namePrefix = "track-";
+  template<> Symbol Traits<Track>::namePrefix = "track";
   template<> Symbol Traits<Track>::catFolder  = "tracks";
+  template<> Symbol Traits<Track>::idSymbol   = "track";
   
-  template<> Symbol Traits<Pipe>::namePrefix = "pipe-";
+  template<> Symbol Traits<Pipe>::namePrefix = "pipe";
   template<> Symbol Traits<Pipe>::catFolder  = "pipes";
+  template<> Symbol Traits<Pipe>::idSymbol   = "pipe";
   
-  template<> Symbol Traits<const ProcPatt>::namePrefix = "patt-";
+  template<> Symbol Traits<const ProcPatt>::namePrefix = "patt";
   template<> Symbol Traits<const ProcPatt>::catFolder  = "build-templates";
+  template<> Symbol Traits<const ProcPatt>::idSymbol   = "procPatt";
   
   
   
@@ -78,30 +88,32 @@ namespace asset
 
       /** @internal derive a sensible asset ident tuple when creating 
        *  structural asset instances  based on a capability query
-       *  @todo define the actual naming scheme of struct assets
        */
       template<class STRU>
       const Asset::Ident
       createIdent (const Query<STRU>& query)
         {
-          static int i=0;
-          static format namePattern ("%s%d-%s"); // TODO finally just use the capability string as name??
-          string name = str(namePattern % Traits<STRU>::namePrefix % (++i) %  query);
-          TODO ("struct asset naming scheme??");
+          string name (query); 
+          string nameID = extractID (Traits<STRU>::idSymbol, query);
+          if (isnil (nameID))
+            {
+               // no name-ID contained in the query...
+              //  so we'll create a new one
+              static int i=0;
+              static format namePattern ("%s.%d");
+              static format predPattern ("%s(%s), ");
+              nameID = str(namePattern % Traits<STRU>::namePrefix % (++i) );
+              name.insert(0, 
+                       str(predPattern % Traits<STRU>::idSymbol % nameID ));
+            }
+          ENSURE (!isnil (name));
+          ENSURE (!isnil (nameID));
+          ENSURE (contains (name, nameID));
+          
           Category cat (STRUCT, Traits<STRU>::catFolder);
           return Asset::Ident (name, cat );
         }
       
-      typedef std::pair<string,string> PipeIDs;
-    
-      PipeIDs
-      createPipeIdent (const Query<Pipe>& query)
-        {
-          string name (Traits<Pipe>::namePrefix + query);  // TODO get some more sensible dummy values
-          TODO ("pipe naming scheme??");
-          TODO ("actually extract the pipe stream type from the query...");
-          return PipeIDs (name, "data");                // dummy stream type
-        }
   
     
       
@@ -153,8 +165,15 @@ namespace asset
     Pipe* 
     StructFactoryImpl::fabricate (const Query<Pipe>& caps)
       {
-        PipeIDs ids (createPipeIdent (caps));
-        return recursive_create_ (ids.first, ids.second).get();
+        const Asset::Ident idi (createIdent (caps));
+        string pipeID = extractID ("pipe", idi.name);
+        string streamID = extractID ("stream", caps);
+        if (isnil (streamID)) streamID = "default"; 
+        PProcPatt processingPattern = Session::current->defaults (Query<const ProcPatt>("stream("+streamID+")"));
+        return new Pipe( idi
+                       , processingPattern
+                       , pipeID
+                       );
       }
     
     
diff --git a/tests/components/proc/asset/basicpipetest.cpp b/tests/components/proc/asset/basicpipetest.cpp
index 315ba83a7..62644b95a 100644
--- a/tests/components/proc/asset/basicpipetest.cpp
+++ b/tests/components/proc/asset/basicpipetest.cpp
@@ -65,11 +65,12 @@ namespace asset
       {
         virtual void run(Arg arg) 
           {
-            string pipeID   = isnil(arg)?  "blackHole" : arg[1];
+            string pipeID   = isnil(arg)?  "Black Hole" : arg[1];
             string streamID = 2>arg.size()? "teststream" : arg[2] ;
             
             createExplicit (pipeID,streamID);
             create_or_ref (pipeID);
+            create_using_default ();
             dependProcPatt (pipeID);
           }
         
@@ -80,6 +81,7 @@ namespace asset
           { 
             string pID_sane (pID);
             normalizeID (pID_sane);
+            ASSERT (pID_sane != pID);
             
             PPipe thePipe = asset::Struct::create (pID,sID);
             
@@ -118,6 +120,7 @@ namespace asset
             ASSERT (c1 == c2);
             
             PPipe pipe3 = Pipe::query ("pipe("+pID2+")");
+//////////////////////////////////////////////////////////////TODO: er macht eine Neue, anstatt die Bestehende zu finden            
             ASSERT (pipe3 == pipe2);
           }
         
@@ -130,7 +133,7 @@ namespace asset
             ASSERT (pipe1 == Session::current->defaults (Query<Pipe>()));
             ASSERT (pipe1->ident.category.hasKind(VIDEO));
             ASSERT (pipe1->getProcPatt());
-            PProcPatt popa = Session::current->defaults (Query<ProcPatt>("pipe()"));
+            PProcPatt popa = Session::current->defaults (Query<const ProcPatt>("pipe(default)"));
             ASSERT (popa == pipe1->getProcPatt());
             
             // several variants to query for "the default pipe"
@@ -138,14 +141,14 @@ namespace asset
             ASSERT (pipe2 == pipe1);
             pipe2 = asset::Struct::create (Query<Pipe> ());
             ASSERT (pipe2 == pipe1);
-            pipe2 = asset::Struct::create (Query<Pipe> ("pipe()"));
+            pipe2 = asset::Struct::create (Query<Pipe> ("pipe(default)"));
             ASSERT (pipe2 == pipe1);
             
             string sID = popa->queryStreamID(); // sort of a "default stream type"
             PPipe pipe3 = Pipe::query ("stream("+sID+")");
             ASSERT (pipe3);
             ASSERT (pipe3->getProcPatt()->queryStreamID() == sID);
-            ASSERT (pipe3->getProcPatt() == Session::current->defaults (Query<ProcPatt>("stream("+sID+")")));
+            ASSERT (pipe3->getProcPatt() == Session::current->defaults (Query<const ProcPatt>("stream("+sID+")")));
           }
         
         

From 4bbf3aa53f90f0b7795b27e8961183162ca63e66 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Wed, 20 Feb 2008 04:05:37 +0100
Subject: [PATCH 05/36] test-driven-brainstorming: how to handle
 query-for-default?

---
 tests/51asset.tests                           |   2 +-
 tests/53session.tests                         |   4 +
 .../proc/mobject/session/defsmanagertest.cpp  | 165 ++++++++++++++++++
 wiki/renderengine.html                        |  96 ++++++----
 4 files changed, 232 insertions(+), 35 deletions(-)
 create mode 100644 tests/components/proc/mobject/session/defsmanagertest.cpp

diff --git a/tests/51asset.tests b/tests/51asset.tests
index 6d8195ceb..5e259e95e 100644
--- a/tests/51asset.tests
+++ b/tests/51asset.tests
@@ -34,7 +34,7 @@ return: 0
 END
 
 
-PLANNED "BasicPort_test" BasicPort_test <<END
+PLANNED "BasicPipe_test" BasicPort_test <<END
 END
 
 
diff --git a/tests/53session.tests b/tests/53session.tests
index fcb6ce3fb..f2ddc5181 100644
--- a/tests/53session.tests
+++ b/tests/53session.tests
@@ -10,6 +10,10 @@ PLANNED "DeleteClip_test" DeleteClip_test <<END
 END
 
 
+PLANNED "DefsManager_test" DefsManager_test <<END
+END
+
+
 PLANNED "RebuildFixture_test" RebuildFixture_test <<END
 END
 
diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp
new file mode 100644
index 000000000..c43f00583
--- /dev/null
+++ b/tests/components/proc/mobject/session/defsmanagertest.cpp
@@ -0,0 +1,165 @@
+/*
+  DefsManager(Test)  -  checking basic behaviour of the defaults manager
+ 
+  Copyright (C)         CinelerraCV
+    2007,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "common/test/run.hpp"
+#include "common/util.hpp"
+
+#include "proc/asset.hpp"
+#include "proc/asset/pipe.hpp"
+#include "common/query.hpp"
+#include "proc/assetmanager.hpp"
+#include "proc/mobject/session.hpp"
+
+#include <boost/format.hpp>
+#include <cstdlib>
+
+using boost::format;
+using util::isnil;
+using std::string;
+
+
+namespace asset
+  {
+  namespace test
+    {
+    using mobject::Session;
+    using cinelerra::Query;
+    using cinelerra::query::normalizeID;
+    
+    
+    
+    /***********************************************************************
+     * @test basic behaviour of the defaults manager.
+     *       <ol><li>retrieving a "default" object repeatedly</li>
+     *           <li>retrieving a more constrained "default" object</li>
+     *           <li>failure registers a new "default"</li>
+     *       </ol>
+     * Using pipe assets as an example. The defaults manager shouldn't
+     * interfere with memory management (it holds weak refs).
+     */
+    class DefsManager_test : public Test
+      {
+        virtual void run(Arg arg) 
+          {
+            string pipeID   = isnil(arg)?  "Black Hole" : arg[1];
+            string streamID = 2>arg.size()? "teststream" : arg[2] ;
+            
+            normalizeID (pipeID);
+            normalizeID (streamID);
+            
+            retrieveSimpleDefault (pipeID);
+            retrieveConstrainedDefault (pipeID, streamID);
+            pipeID = failureCreatesNewDefault();
+            verifyRemoval (pipeID);
+          }
+        
+        
+        
+        
+        void retrieveSimpleDefault(string pID)
+          { 
+            PPipe pipe1 = Pipe::query (""); // "the default pipe"
+            PPipe pipe2;
+            
+            // several variants to query for "the default pipe"
+            pipe2 = Pipe::query ("");
+            ASSERT (pipe2 == pipe1);
+            pipe2 = Pipe::query ("default(X)");
+            ASSERT (pipe2 == pipe1);
+            pipe2 = Session::current->defaults(Query<Pipe> ());
+            ASSERT (pipe2 == pipe1);
+            pipe2 = asset::Struct::create (Query<Pipe> ());
+            ASSERT (pipe2 == pipe1);
+            pipe2 = asset::Struct::create (Query<Pipe> ("default(X)"));
+            ASSERT (pipe2 == pipe1);
+          }
+        
+        
+        void retrieveConstrainedDefault(string pID, string sID)
+          { 
+            PPipe pipe1 = Pipe::query (""); // "the default pipe"
+            ASSERT (sID != pipe1->getProcPatt()->queryStreamID(),
+                    "stream-ID \"%s\" not suitable for test, because "
+                    "the default-pipe \"%s\" happens to have the same "
+                    "stream-ID. We need it to be different", 
+                    sID.c_str(), pID.c_str()
+                   );
+            
+            string query_for_sID ("stream("+sID+")");
+            PPipe pipe2 = Pipe::query (query_for_sID);
+            ASSERT (sID == pipe2->getProcPatt()->queryStreamID());
+            ASSERT (pipe2 != pipe1);
+            ASSERT (pipe2 == Pipe::query (query_for_sID));   // reproducible
+          }
+        
+        
+        string failureCreatesNewDefault ()
+          { 
+            PPipe pipe1 = Session::current->defaults(Query<Pipe> ()); // "the default pipe"
+
+            string new_pID (str (format ("dummy_%s_%i") 
+                                 % pipe1->getPipeID()
+                                 % std::rand()
+                                ));     // make random new pipeID  
+            string query_for_new ("pipe("+new_pID+")");
+            PPipe pipe2 = Session::current->defaults(Query<Pipe> (query_for_new));
+            
+            TODO ("a way to do only a query, without creating. Use this to check it is really added as default");
+            
+            ASSERT (pipe1 != pipe2);
+            ASSERT (pipe2 == Pipe::query (query_for_new));
+            return new_pID;
+          }
+        
+        
+        void verifyRemoval(string pID)
+          { 
+            string query_for_pID ("pipe("+pID+")");
+            size_t hash;
+              {
+                PPipe pipe1 = Pipe::query (query_for_pID);
+                hash = pipe1->getID();
+              }
+             // now AssetManager should have the only ref
+            ID<Asset> assetID (hash);
+              
+            AssetManager& aMang (AssetManager::instance());
+            ASSERT ( aMang.known (assetID));
+            aMang.remove (assetID);
+            ASSERT (!aMang.known (assetID));
+            
+            TODO ("assure the bare default-query now fails...");
+            PPipe pipe2 = Session::current->defaults(Query<Pipe> (query_for_pID));
+            TODO ("assure the bare default-query now succeeds...");
+          }
+      };
+    
+    
+    /** Register this test class... */
+    LAUNCHER (DefsManager_test, "function session");
+    
+    
+    
+  } // namespace test
+
+} // namespace asset
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 5bc243c00..35ed4e339 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -797,7 +797,7 @@ Error: #f88</pre>
 &amp;rarr; [[Configuration Rules system|ConfigRules]]
 </pre>
 </div>
-<div title="ConfigRules" modifier="Ichthyostega" modified="200802130339" created="200801171352" tags="overview spec" changecount="8">
+<div title="ConfigRules" modifier="Ichthyostega" modified="200802200145" created="200801171352" tags="overview spec" changecount="11">
 <pre>Many features can be implemented by specifically configuring and wiring some unspecific components. Rather than tie the client code in need of some given feature to these configuration internals, in Cinelerra-3 the client can //query // for some kind of object providing the //needed capabilities. // Right from start (summer 2007), Ichthyo had the intention to implement such a feature using sort of a ''declarative database'', e.g. by embedding a Prolog system. By adding rules to the basic session configuration, users should be able to customize the semi-automatic part of Cinelerra's behaviour to great extent.
 
 [[Configuration Queries|ConfigQuery]] are used at various places, when creating and adding new objects, as well when building or optimizing the render engine node network.
@@ -808,7 +808,7 @@ Error: #f88</pre>
 
 !anatomy of a Configuration Query
 The query is given as a number of logic predicates, which are required to be true. Syntactically, it is a string in prolog syntax, e.g. {{{stream(mpeg)}}}, where &quot;stream&quot; is the //predicate, // meaning here &quot;the stream type is...?&quot; and &quot;mpeg&quot; is a //term // denoting an actual property, object, thing, number etc &amp;mdash; the actual kind of stream in the given example. Multible comma separated predicates are combined with logical &quot;and&quot;. Terms may be //variable // at start, which is denoted syntactically by starting them with a uppercase letter. But any variable term need to be //bound //  to some known value while computing the solution to the query, otherwise the query fails. A failed query is treated as a local failure, which may cause some operation being aborted or just some other possibility being chosen.
-Queries are represented by instantiations of the {{{Query&lt;TYPE&gt;}}} template, because their actual meaning is &quot;retrieve or create an object of TYPE, configured such that...!&quot;. At the C++ side, this ensures type safety and fosters programming against interfaces, while being implemented rule-wise by silently prepending the query with the predicate &quot;{{{object(tYPE)}}}&quot;
+Queries are represented by instantiations of the {{{Query&lt;TYPE&gt;}}} template, because their actual meaning is &quot;retrieve or create an object of TYPE, configured such that...!&quot;. At the C++ side, this ensures type safety and fosters programming against interfaces, while being implemented rule-wise by silently prepending the query with the predicate &quot;{{{object(TYPE)}}}&quot;
 
 !executing a Configuration Query
 Actually posing such an configuration query, for example to the [[Defaults Manager in the Sessison|DefaultsManagement]], may trigger several actions: First it is checked against internal object registries (depending on the target object type), which may cause the delivery of an already existing object (as reference, clone, or smart pointer). Otherwise, the system tries to figure out an viable configuration for a newly created object instance, possibly by issuing recursive queries. In the most general case this may silently impose additional decisions onto the //execution context // of the query &amp;mdash; by default the session.
@@ -818,6 +818,9 @@ At start and for debugging/testing, there is an ''dummy'' implementation using a
 &amp;rarr; [[considerations for a Prolog based implementation|QueryImplProlog]]
 &amp;rarr; see {{{src/common/query/mockconfigrules.cpp}}} for the table with the hard wired (mock) answers
 
+
+{{red{WARN}}} there is an interference with the (planned) Undo function: a totally correct implementation of &quot;Undo&quot; would need to remember and restore the internal state of the query system (similar to backtracking). But, more generally, such an correct implementation is not achievable, because we are never able to capture and control the whole state of a real world system doing such advanced things like video and sound processing. Seemingly we have to accept that after undoing an action, there is no guarantee we can re-do it the same way as it was first time.
+
 </pre>
 </div>
 <div title="Controller" modifier="Ichthyostega" modified="200712090624" created="200706220319" tags="def" changecount="4">
@@ -839,10 +842,36 @@ This is an very important external Interface, because it links together all thre
 <pre>[[ProcLayer and Engine]]
 </pre>
 </div>
-<div title="DefaultsManagement" modifier="Ichthyostega" modified="200801171440" created="200801121708" tags="def spec" changecount="5">
-<pre>For several components and properties there is an implicit default value or configuration; it is stored alongside with the session. The intention is that defaults never create an error, instead, they are to be extended silently on demand. Objects configured according to this defaults can be retrieved at the [[Session]] interface by a set of overloaded functions {{{Session::current-&gt;default(Query&lt;TYPE&gt; (&quot;query string&quot;))}}}, where the //query string // defines a capability query similar to what is employed for pipes, stream types, codecs etc. The Queries are implemented by [[configuration rules|ConfigRules]]
+<div title="DefaultsImplementation" modifier="Ichthyostega" modified="200802200145" created="200802200043" tags="spec impl draft" changecount="6">
+<pre>As detailed in the [[definition|DefaultsManagement]], {{{default(Obj)}}} is sort of a Joker along the lines &quot;give me a suitable Object and I don't care for further details&quot;. Actually, default objects are implemented by the {{{mobject::session::DefsManager}}}, which remembers and keeps track of anything labeled as &quot;default&quot;. This defaults manager is a singleton and can be accessed via the [[Session]] interface, meaning that the memory regarding defaults is part of the session state. Accessing an object via the query for an default actually //tagges// this object (stores a weak ref in the ~DefsManager). Alongside with each object successfully queried via &quot;default&quot;, the degree of constriction is remembered, i.e. the number of additional conditions contained in the query. This enables us to search for default objects starting with the most unspecific.
+
+!Skeleton
+# ''search'': using the predicate {{{default(X)}}} enumerates existing objects of suitable type
+#* candidates are delivered starting with the least constrained default
+#* the argument is unified
+#** if the rest of the query succeeds we've found our //default object// and are happy.
+#** otherwise, if all enumerated solutions are exhausted without success, we enter
+# ''default creation'': try to get an object fulfilling the conditions and remember this situation
+#* we issue an ConfigQuery with the query terms //minus// the {{{default(X)}}} predicate
+#* it depends on the circumstances how this query is handled. Typically the query resolution first searches existing objects and then creates a new instance to match the required capabilities. Usually, this process succeeds, but there can be configurations leading to failure.
+#** failing the ~ConfigQuery is considered an (non-critical) exception (throws), as defaults queries are supposed to succeed
+#** otherwise, the newly created object is remembered (tagged) as new default, together with the degree of constriction
+
+!!!Implementation details
+Taken precisely, the &quot;degree of constriction&quot; yields only a partial ordering &amp;mdash; but as the &quot;default&quot;-predicate is sort of a existential quantification anyways, its sole purpose is to avoid polluting the session with unnecessary default objects, and we don't need to care for absolute precision. A suitable approximation is to count the number of predicates terms in the query and use a pqueue (separate for each Type) to store weak refs to the the objects tagged as &quot;default&quot;
+{{red{WARN}}} there is an interference with the (planned) Undo function. This is a general problem of the config queries; it seems reasonable we can ignore this issue.
+
+!!!Problems with the (preliminary) mock implementation
+As we don't have a Prolog interpreter on board yet, we utilize a mock store with preconfigured answers. (see {{{MockConfigQuery}}}). As this preliminary solution is lacking the ability to create new objects, we need to resort to some trickery here (please look away). The overall logic is quite broken, because the system isn't capable to do any real resolution &amp;mdash; if we ignore this fact, the rest of the algorithm can be implemented, tested and used right now.
 </pre>
 </div>
+<div title="DefaultsManagement" modifier="Ichthyostega" modified="200802200023" created="200801121708" tags="def spec" changecount="11">
+<pre>For several components and properties there is an implicit default value or configuration; it is stored alongside with the session. The intention is that defaults never create an error, instead, they are to be extended silently on demand. Objects configured according to this defaults can be retrieved at the [[Session]] interface by a set of overloaded functions {{{Session::current-&gt;default(Query&lt;TYPE&gt; (&quot;query string&quot;))}}}, where the //query string // defines a capability query similar to what is employed for pipes, stream types, codecs etc. The Queries are implemented by [[configuration rules|ConfigRules]]
+
+!!!!what is denoted by {{{default}}}?
+{{{default(Obj)}}} is a predicate expressing that the object {{{Obj}}} can be considered the default setup under the given conditions. Using the //default// can be considered as a shortcut for actually finding a exact and unique solution. The latter would require to specify all sorts of detailed properties up to the point where only one single object can satisfy all conditions. On the other hand, leaving some properties unspecified would yield a set of solutions (and the user code issuing the query had to provide means for selecting one soltution from this set). Just falling back on the //default// means that the user code actually doesn't care for any additional properties (as long as the properties he //does// care for are satisfied). Nothing is said specifically on //how//&amp;nbsp; this default gets configured; actually there can be rules //somewhere,// and, additionally, anything encountered once while asking for a default can be re-used as default under similar circumstances.
+&amp;rarr; [[implementing defaults|DefaultsImplementation]]</pre>
+</div>
 <div title="DesignDecisions" modifier="Ichthyostega" modified="200801062304" created="200801062209" tags="decision design discuss" changecount="17">
 <pre>Along the way of working out various [[implementation details|ImplementationDetails]], decisions need to be made on how to understand the different facilities and entities and how to tackle some of the problems. This page is mainly a collection of keywords, summaries and links to further the discussion. And the various decisions should allways be read as proposals to solve some problem at hand...
 
@@ -2226,6 +2255,33 @@ DAMAGE.
 &lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
 ***/</pre>
 </div>
+<div title="Pipe" modifier="Ichthyostega" modified="200802101340" created="200801062110" tags="def decision" changecount="5">
+<pre>Pipes play an central role within the Proc Layer, because for everything placed and handled within the EDL, the final goal is to get it transformed into data which can be retrieved at some pipe's exit port. Pipes are special facilities, rather like inventory, separate and not treated like all the other objects.
+We don't distinguish between &quot;input&quot; and &quot;output&quot; ports &amp;mdash; rather, pipes are thought to be ''hooks for making connections to''. By following this line of thought, each pipe has an input side and an output side and is in itself something like a ''Bus'' or ''processing chain''. Other processing entities like effects and transitions can be placed (attached) at the pipe, resulting them to be appended to form this chain. Likewise, we can place [[wiring requests|WiringRequest]] to the pipe, meaning we want it connected so to send it's output to another destination pipe. The [[Builder]] may generate further wiring requests to fulfil the placement of other entities.
+Thus //Pipes are the basic building blocks// of the whole render network. We distinguish ''global available'' Pipes, which are like the sum groups of a mixing console, and the ''lokal pipe'' or [[source port|ClipSourcePort]] of the individual clips, which exist only within the duration of the corresponding clip. The design //limits the possible kinds of pipes // to these two types &amp;mdash; thus we can build local processing chains at clips and global processing chains at the global pipes of the session and that's all we can do. (because of the flexibility which comes with the concept of [[placements|Placement]], this is no real limitation)
+
+The GUI can connect the viewer(s) to some pipe (and moreover can use [[probe points|ProbePoint]] placed like effects and connected to some pipe), and likewise, when starting a ''render'', we get the opportunity to specify the pipes to pull the data from. Pulling data from some pipe is the (only) way to activate the render nodes network reachable from this pipe.
+
+&amp;rarr; [[Handling of Tracks|TrackHandling]]
+&amp;rarr; [[Handling of Pipes|PipeHandling]]
+
+</pre>
+</div>
+<div title="PipeHandling" modifier="Ichthyostega" modified="200801121656" created="200801101352" tags="spec" changecount="9">
+<pre>!Identification
+Pipes are distinct objects and can be identified by their asset ~IDs. Besides, as for all [[structural assets|StructAsset]] there are extended query capabilities, including a symbolic pipe-id and a media (stream) type id. Any pipe can accept and deliver exactly one media stream kind (which may be inherently structured though, e.g. spatial sound systems or stereoscopic video)
+
+!creating pipes
+Pipe assets are created automatically by being used and referred. The [[Session]] holds a collection of global pipes, and further pipes can be created by using an new pipe reference in some placement. Moreover, every clip has an (implicit) [[source port|ClipSourcePort]], which will appear as pipe asset when first used (referred) while [[building|BuildProcess]].
+
+!removal
+Deleting a Pipe is an advanced operation, because it includes finding and &quot;detaching&quot; all references, otherwise the pipe will leap back into existence immediately. Thus, global pipe entries in the Session and pipe references in [[locating pins|LocatingPin]] within any placement have to be removed, while clips using a given source port will be disabled. {{red{todo: implementation deferred}}}
+
+!using Pipes
+there is not much you can do directly with a pipe asset. It is an point of reference, after all. Any connection to some pipe is only temporarily done by a placement in some part of the timeline, so it isn't stored with the pipe. You can edit the (user visible) description an you can globally disable a pipe asset. The pipe's ID and media stream type of course are fixed, because any connection and referral (via the asset ID) is based on them. Later on, we should provide a {{{rewire(oldPipe, newPipe)}}} to search any ref to the {{{oldPipe}}} and try to rewrite it to use the {{{newPipe}}}, possibly with a new media stream type.
+Pipes are integrated with the [[management of defaults|DefaultsManagement]]. For example, any pipe uses implicitly some [[processing pattern|ProcPatt]] &amp;mdash; it may default to the empty pattern. This feature enables to apply some standard wiring to the pipes (e.g a fader for audio, similar to the classic mixing consoles). This //is // a global property of the pipe, but &amp;mdash; contrary to the stream type &amp;mdash; this pattern may be switched
+</pre>
+</div>
 <div title="Placement" modifier="Ichthyostega" modified="200710100120" created="200706220306" tags="def" changecount="6">
 <pre>A Placement represents a //relation:// it is always linked to a //Subject// (this being a [[Media Object|MObject]]) and has the meaning to //place// this Subject in some manner, either relatively to other Media Objects, or by some Constraint or simply absolute at (time,track). The latter case is especially important and represented by a special [[Sub-Interface|ExplicitPlacement]]
 
@@ -2351,34 +2407,6 @@ We need a way of addressing existing [[pipes|Pipe]]. Besides, as the Pipes and T
 //Note, we have yet to specify how exactly the building and rendering will work together with the backend. There are several possibilities how to structure the Playlist//
 </pre>
 </div>
-<div title="Pipe" modifier="Ichthyostega" modified="200802101340" created="200801062110" tags="def decision" changecount="5">
-<pre>
-Pipes play an central role within the Proc Layer, because for everything placed and handled within the EDL, the final goal is to get it transformed into data which can be retrieved at some pipe's exit port. Pipes are special facilities, rather like inventory, separate and not treated like all the other objects.
-We don't distinguish between &quot;input&quot; and &quot;output&quot; ports &amp;mdash; rather, pipes are thought to be ''hooks for making connections to''. By following this line of thought, each pipe has an input side and an output side and is in itself something like a ''Bus'' or ''processing chain''. Other processing entities like effects and transitions can be placed (attached) at the pipe, resulting them to be appended to form this chain. Likewise, we can place [[wiring requests|WiringRequest]] to the pipe, meaning we want it connected so to send it's output to another destination pipe. The [[Builder]] may generate further wiring requests to fulfil the placement of other entities.
-Thus //Pipes are the basic building blocks// of the whole render network. We distinguish ''global available'' Pipes, which are like the sum groups of a mixing console, and the ''lokal pipe'' or [[source port|ClipSourcePort]] of the individual clips, which exist only within the duration of the corresponding clip. The design //limits the possible kinds of pipes // to these two types &amp;mdash; thus we can build local processing chains at clips and global processing chains at the global pipes of the session and that's all we can do. (because of the flexibility which comes with the concept of [[placements|Placement]], this is no real limitation)
-
-The GUI can connect the viewer(s) to some pipe (and moreover can use [[probe points|ProbePoint]] placed like effects and connected to some pipe), and likewise, when starting a ''render'', we get the opportunity to specify the pipes to pull the data from. Pulling data from some pipe is the (only) way to activate the render nodes network reachable from this pipe.
-
-&amp;rarr; [[Handling of Tracks|TrackHandling]]
-&amp;rarr; [[Handling of Pipes|PipeHandling]]
-
-</pre>
-</div>
-<div title="PipeHandling" modifier="Ichthyostega" modified="200801121656" created="200801101352" tags="spec" changecount="9">
-<pre>!Identification
-Pipes are distinct objects and can be identified by their asset ~IDs. Besides, as for all [[structural assets|StructAsset]] there are extended query capabilities, including a symbolic pipe-id and a media (stream) type id. Any pipe can accept and deliver exactly one media stream kind (which may be inherently structured though, e.g. spatial sound systems or stereoscopic video)
-
-!creating pipes
-Pipe assets are created automatically by being used and referred. The [[Session]] holds a collection of global pipes, and further pipes can be created by using an new pipe reference in some placement. Moreover, every clip has an (implicit) [[source port|ClipSourcePort]], which will appear as pipe asset when first used (referred) while [[building|BuildProcess]].
-
-!removal
-Deleting a Pipe is an advanced operation, because it includes finding and &quot;detaching&quot; all references, otherwise the pipe will leap back into existence immediately. Thus, global pipe entries in the Session and pipe references in [[locating pins|LocatingPin]] within any placement have to be removed, while clips using a given source port will be disabled. {{red{todo: implementation deferred}}}
-
-!using Pipes
-there is not much you can do directly with a pipe asset. It is an point of reference, after all. Any connection to some pipe is only temporarily done by a placement in some part of the timeline, so it isn't stored with the pipe. You can edit the (user visible) description an you can globally disable a pipe asset. The pipe's ID and media stream type of course are fixed, because any connection and referral (via the asset ID) is based on them. Later on, we should provide a {{{rewire(oldPipe, newPipe)}}} to search any ref to the {{{oldPipe}}} and try to rewrite it to use the {{{newPipe}}}, possibly with a new media stream type.
-Pipes are integrated with the [[management of defaults|DefaultsManagement]]. For example, any pipe uses implicitly some [[processing pattern|ProcPatt]] &amp;mdash; it may default to the empty pattern. This feature enables to apply some standard wiring to the pipes (e.g a fader for audio, similar to the classic mixing consoles). This //is // a global property of the pipe, but &amp;mdash; contrary to the stream type &amp;mdash; this pattern may be switched
-</pre>
-</div>
 <div title="ProblemsTodo" modifier="Ichthyostega" modified="200709251721" created="200708050524" tags="design discuss" changecount="15">
 <pre>Open issues, Things to be worked out, Problems still to be solved... 
 
@@ -2484,9 +2512,9 @@ Like all [[structural assets|StructAsset]], ~ProcPatt employs a special naming s
 <pre>a given Render Engine configuration is a list of Processors. Each Processor in turn contains a Graph of ProcNode.s to do the acutal data processing. In order to cary out any calculations, the Processor needs to be called with a StateProxy containing the state information for this RenderProcess
 </pre>
 </div>
-<div title="QueryImplProlog" modifier="Ichthyostega" modified="200801270339" created="200801202321" tags="draft design" changecount="14">
+<div title="QueryImplProlog" modifier="Ichthyostega" modified="200802192354" created="200801202321" tags="draft design" changecount="15">
 <pre>//obviously, getting this one to work requires quite a lot of technical details to be planned and implemented.// This said...
-The intention is to get much more readable (&quot;declarative&quot;) and changeable configuration as by programming it directly within the implementation of some object.
+The intention is to get much more readable (&quot;declarative&quot;) and changeable configuration as by programming the decision logic literately within the implementation of some object.
 
 !Draft
 As an example, specifying how a Track can be configured for connecting automatically to some &quot;mpeg&quot; bus (=pipe)

From 919a57ed9a2717348d9c5fe08980d4ab09a9bb03 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 22 Feb 2008 04:58:37 +0100
Subject: [PATCH 06/36] doc comment fix

---
 src/common/configrules.hpp                   | 2 +-
 src/common/query/mockconfigrules.hpp         | 2 +-
 src/common/singletonsubclass.hpp             | 2 +-
 src/proc/asset/db.hpp                        | 2 +-
 src/proc/mobject/explicitplacement.hpp       | 2 +-
 tests/components/common/typelistutiltest.cpp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/configrules.hpp b/src/common/configrules.hpp
index a247eb30d..872d34724 100644
--- a/src/common/configrules.hpp
+++ b/src/common/configrules.hpp
@@ -26,7 +26,7 @@
  ** By using the Query template, you can pose a query in prolog syntax and get some
  ** existing or newly created object fulfilling the requested predicates. The actual 
  ** implementation is hidden behind the #instance (Singleton factory). As of 1/2008, 
- ** it is \i planned to use an embedded YAP Prolog system at some point in the future,
+ ** it is \e planned to use an embedded YAP Prolog system at some point in the future,
  ** for now we use a \link MockConfigRules mock implementation \endlink employing a
  ** preconfigured Map.
  **
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index 7b6ce6374..51f4a4cb7 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -96,7 +96,7 @@ namespace cinelerra
     
     /** 
      * building block defining how to do 
-     * the mock implementation for \i one type.
+     * the mock implementation for \e one type.
      * We simply access a table holding pre-created objects.
      */
     template<class TY, class BASE>
diff --git a/src/common/singletonsubclass.hpp b/src/common/singletonsubclass.hpp
index e779b820e..269351185 100644
--- a/src/common/singletonsubclass.hpp
+++ b/src/common/singletonsubclass.hpp
@@ -81,7 +81,7 @@ namespace cinelerra
               My_scoped_ptr() : scoped_ptr<Link> (get()? get() : 0) {}   ///< bypass if already configured
             };
             
-          /** we configure this link \i later, when the singleton factory
+          /** we configure this link \e later, when the singleton factory
            *  is actually created, to point at the desired implementation subclass.
            */
           static My_scoped_ptr link;
diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp
index 8de442102..ee6ea753d 100644
--- a/src/proc/asset/db.hpp
+++ b/src/proc/asset/db.hpp
@@ -110,7 +110,7 @@ namespace asset
        *  As the destructor of DB needs to call clear(), this
        *  could result in segfaults. This doesn't seem to be
        *  a problem, though, because we register and process
-       *  \i all assets and the net effect is just breaking
+       *  \e all assets and the net effect is just breaking
        *  any cyclic dependencies) 
        */ 
       void
diff --git a/src/proc/mobject/explicitplacement.hpp b/src/proc/mobject/explicitplacement.hpp
index 9cf0917aa..5f70047b9 100644
--- a/src/proc/mobject/explicitplacement.hpp
+++ b/src/proc/mobject/explicitplacement.hpp
@@ -53,7 +53,7 @@ namespace mobject
       typedef std::pair<Time,Pipe> SolutionData;  //TODO (ichthyo consideres better passing of solution by subclass)
 
       /** no need to resolve any further, as this ExplicitPlacement
-       *  already \i is the result of a resolve()-call.
+       *  already \e is the result of a resolve()-call.
        */
       virtual
       ExplicitPlacement resolve ()  const 
diff --git a/tests/components/common/typelistutiltest.cpp b/tests/components/common/typelistutiltest.cpp
index 842a1c5ec..327242e8e 100644
--- a/tests/components/common/typelistutiltest.cpp
+++ b/tests/components/common/typelistutiltest.cpp
@@ -26,7 +26,7 @@
  **
  ** the following test composes both an interface and the corresponding implementation
  ** by instantiating "building block" templates over a collection of types. The resulting
- ** class ends up inheriting a \i virtual function instantiated for each of the types 
+ ** class ends up inheriting a \e virtual function instantiated for each of the types 
  ** in the list. (remember: normally the number and signature of all virtual functions
  ** need to be absolutely fixed in the class definition)
  **

From 4af2d479956d27affc8ff74d63c464273f344fb0 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 29 Feb 2008 04:27:24 +0100
Subject: [PATCH 07/36] test-driven-brainstorming: DefsManager interface
 building blocks

---
 src/proc/mobject/session/defsmanager.cpp      |  30 ++++
 src/proc/mobject/session/defsmanager.hpp      |  37 ++++
 .../mobject/session/defsmanagerimpltest.cpp   | 163 ++++++++++++++++++
 .../proc/mobject/session/defsmanagertest.cpp  |  37 ++--
 wiki/renderengine.html                        |   6 +-
 5 files changed, 258 insertions(+), 15 deletions(-)
 create mode 100644 tests/components/proc/mobject/session/defsmanagerimpltest.cpp

diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp
index bfb505efb..52b78437b 100644
--- a/src/proc/mobject/session/defsmanager.cpp
+++ b/src/proc/mobject/session/defsmanager.cpp
@@ -44,6 +44,7 @@ namespace mobject
   {
   namespace session
     {
+    using std::tr1::shared_ptr;
     
     /** initialize the most basic internal defaults. */
     DefsManager::DefsManager ()  throw()
@@ -51,11 +52,40 @@ namespace mobject
       TODO ("setup basic defaults of the session");
     }
 
+    template<class TAR>
+    shared_ptr<TAR> 
+    DefsManager::search  (const Query<TAR>& capabilities)
+    {
+      UNIMPLEMENTED ("search for default registered object, dont create");
+    }
+    
+    template<class TAR>
+    shared_ptr<TAR> 
+    DefsManager::create  (const Query<TAR>& capabilities)
+    {
+      UNIMPLEMENTED ("retrieve object and register as default");
+    }
+    
+    template<class TAR>
+    bool 
+    DefsManager::define  (shared_ptr<TAR>& defaultObj, const Query<TAR>& capabilities)
+    {
+      UNIMPLEMENTED ("just do the defaults registration");
+    }
+
+    template<class TAR>
+    bool 
+    DefsManager::forget  (shared_ptr<TAR>& defaultObj)
+    {
+      UNIMPLEMENTED ("purge defaults registration");
+    }
+
     
     template<class TAR>
     shared_ptr<TAR> 
     DefsManager::operator() (const Query<TAR>& capabilities)
     {
+      TODO ("move this code to create()");
       QueryHandler<TAR>& typeHandler = ConfigRules::instance();  
       shared_ptr<TAR> res = typeHandler.resolve (capabilities);
       
diff --git a/src/proc/mobject/session/defsmanager.hpp b/src/proc/mobject/session/defsmanager.hpp
index b48411058..16c6a7bfc 100644
--- a/src/proc/mobject/session/defsmanager.hpp
+++ b/src/proc/mobject/session/defsmanager.hpp
@@ -56,9 +56,46 @@ namespace mobject
         friend class SessManagerImpl;
         
       public:
+        /** common access point: retrieve the default object fulfilling
+         *  some given conditions. May silently trigger object creation.
+         *  @throw error::Config in case no solution is possible, which
+         *         is considered \e misconfiguration. 
+         */
         template<class TAR>
         shared_ptr<TAR> operator() (const cinelerra::Query<TAR>&);
         
+        /** search through the registered defaults, never create anything.
+         *  @return object fulfilling the query, \c empty ptr if not found. 
+         */
+        template<class TAR>
+        shared_ptr<TAR> search  (const cinelerra::Query<TAR>&);
+        
+        /** retrieve an object fulfilling the query and register it as default.
+         *  The resolution is delegated to the ConfigQuery system (which may cause
+         *  creation of new object instances) 
+         *  @return object fulfilling the query, \c empty ptr if no solution.
+         */ 
+        template<class TAR>
+        shared_ptr<TAR> create  (const cinelerra::Query<TAR>&);
+        
+        /** register the given object as default, after ensuring it fulfills the
+         *  query. The latter may cause some properties of the object to be set,
+         *  trigger creation of additional objects, and may fail altogether.
+         *  @return true if query was successfull and object is registered as default
+         *  @note only a weak ref to the object is stored
+         */ 
+        template<class TAR>
+        bool define  (shared_ptr<TAR>&, const cinelerra::Query<TAR>&);
+        
+        /** remove the defaults registration of the given object, if there was such
+         *  @return false if nothing has been changed because the object wasn't registered
+         */
+        template<class TAR>
+        bool forget  (shared_ptr<TAR>&);
+        
+        
+// Q: can we have something along the line of...?
+//
 //        template
 //          < class TAR,                   ///< the target to query for 
 //            template <class> class SMP  ///<  smart pointer class to wrap the result
diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
new file mode 100644
index 000000000..920da9467
--- /dev/null
+++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
@@ -0,0 +1,163 @@
+/*
+  DefsManagerImpl(Test)  -  checking implementation details of the defaults manager
+ 
+  Copyright (C)         CinelerraCV
+    2007,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "common/test/run.hpp"
+#include "common/util.hpp"
+
+#include "proc/asset.hpp"
+#include "proc/asset/pipe.hpp"
+#include "common/configrules.hpp"
+#include "proc/assetmanager.hpp"
+#include "proc/mobject/session.hpp"
+
+#include <boost/format.hpp>
+#include <cstdlib>
+
+using boost::format;
+using util::isnil;
+using std::string;
+
+
+namespace asset
+  {
+  namespace test
+    {
+    using mobject::Session;
+    using cinelerra::Symbol;
+    using cinelerra::Query;
+    using cinelerra::query::normalizeID;
+    
+    using cinelerra::ConfigRules;
+    using cinelerra::query::QueryHandler;
+    
+    
+    /** shortcut: query without creating new instances */
+    bool 
+    find (Query<Pipe>& q) 
+    { 
+      return Session::current->defaults.search (q); 
+    }
+    
+    /** shortcut: query for given Pipe-ID */
+    bool 
+    find (const string& pID) 
+    { 
+      return Session::current->defaults.search (Query<Pipe> ("pipe("+pID+")")); 
+    }
+    
+    
+    format pattern ("dummy_%s_%i");
+    
+    /** create a random new ID */
+    string 
+    newID (Symbol prefix)
+    {
+      return str (pattern % prefix % std::rand());
+    }
+    
+    
+    
+    
+    /************************************************************************
+     * @test verify some general assumptions regarding implementation details
+     *       of the the defaults manager.
+     * @see  DefsManager_test for the "big picture"
+     */
+    class DefsManagerImpl_test : public Test
+      {
+        virtual void run(Arg arg) 
+          {
+            define_and_search();
+            string pipeID = create();
+            forget(pipeID);
+          }
+        
+        
+        
+        
+        void define_and_search ()
+          {
+            string sID = newID ("stream");
+            
+             // create Pipes explicitly 
+            //  (without utilizing default queries)
+            PPipe pipe1 = Struct::create (newID("pipe"), newID("stream")); 
+            PPipe pipe2 = Struct::create (newID("pipe"), sID            );
+            
+            ASSERT (pipe1 != pipe2);
+            ASSERT (sID == pipe2->getProcPatt()->queryStreamID());
+            
+            ASSERT (!find (pipe1->getPipeID()), "accidental clash of random test-IDs");
+            ASSERT (!find (pipe2->getPipeID()), "accidental clash of random test-IDs");
+            
+            // now declare that these objects should be considered "default"
+            ASSERT (Session::current->defaults.define (pipe1, Query<Pipe> (""))); // unrestricted default
+            ASSERT (Session::current->defaults.define (pipe1, Query<Pipe> ("stream("+sID+")")));
+            
+            ASSERT ( find (pipe1->getPipeID()), "failure declaring object as default");
+            ASSERT ( find (pipe2->getPipeID()), "failure declaring object as default");
+          }
+        
+        
+        const string& create ()
+          { 
+            string sID = newID ("stream");
+            Query<Pipe> query_for_streamID ("stream("+sID+")");
+            
+            // issue a ConfigQuery directly, without involving the DefaultsManager
+            QueryHandler<Pipe>& typeHandler = ConfigRules::instance();  
+            PPipe pipe1 = typeHandler.resolve (query_for_streamID);
+            ASSERT (pipe1);
+            
+            ASSERT (!find (pipe1->getPipeID()));
+            PPipe pipe2 = Session::current->defaults.create (query_for_streamID);
+            ASSERT (pipe2);
+            ASSERT (pipe2 == pipe1);
+            ASSERT ( find (pipe1->getPipeID())); // now declared as "default Pipe" for this stream-ID
+            
+            return pipe1->getPipeID();
+          }
+        
+        
+        void forget(string pID)
+          { 
+            PPipe pipe = Pipe::query ("pipe("+pID+")");
+            REQUIRE (find (pipe->getPipeID()), "need an object registered as default");
+            long cnt = pipe.use_count();
+            
+            // now de-register the pipe as "default Pipe"
+            ASSERT (Session::current->defaults.forget (pipe));
+            ASSERT (!find (pipe->getPipeID()));
+            ASSERT (cnt == pipe.use_count());   // indicates that DefaultsManager only holds a weak ref.
+          }
+      };
+    
+    
+    /** Register this test class... */
+    LAUNCHER (DefsManagerImpl_test, "function session");
+    
+    
+    
+  } // namespace test
+
+} // namespace asset
diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp
index c43f00583..16c09336a 100644
--- a/tests/components/proc/mobject/session/defsmanagertest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagertest.cpp
@@ -47,6 +47,17 @@ namespace asset
     using cinelerra::query::normalizeID;
     
     
+    /** shortcut: run just a query
+     *  without creating new instances
+     */
+    bool 
+    find (Query<Pipe>& q) 
+    { 
+      return Session::current->defaults.search (q); 
+    }
+    
+    
+    
     
     /***********************************************************************
      * @test basic behaviour of the defaults manager.
@@ -76,7 +87,7 @@ namespace asset
         
         
         
-        void retrieveSimpleDefault(string pID)
+        void retrieveSimpleDefault (string pID)
           { 
             PPipe pipe1 = Pipe::query (""); // "the default pipe"
             PPipe pipe2;
@@ -95,7 +106,7 @@ namespace asset
           }
         
         
-        void retrieveConstrainedDefault(string pID, string sID)
+        void retrieveConstrainedDefault (string pID, string sID)
           { 
             PPipe pipe1 = Pipe::query (""); // "the default pipe"
             ASSERT (sID != pipe1->getProcPatt()->queryStreamID(),
@@ -121,23 +132,24 @@ namespace asset
                                  % pipe1->getPipeID()
                                  % std::rand()
                                 ));     // make random new pipeID  
-            string query_for_new ("pipe("+new_pID+")");
-            PPipe pipe2 = Session::current->defaults(Query<Pipe> (query_for_new));
+            Query<Pipe> query_for_new ("pipe("+new_pID+")");
             
-            TODO ("a way to do only a query, without creating. Use this to check it is really added as default");
+            ASSERT (!find (query_for_new));                             // check it doesn't exist 
+            PPipe pipe2 = Session::current->defaults (query_for_new);   // triggers creation
+            ASSERT ( find (query_for_new));                             // check it exists now
             
             ASSERT (pipe1 != pipe2);
-            ASSERT (pipe2 == Pipe::query (query_for_new));
+            ASSERT (pipe2 == Session::current->defaults (query_for_new));
             return new_pID;
           }
         
         
-        void verifyRemoval(string pID)
+        void verifyRemoval (string pID)
           { 
-            string query_for_pID ("pipe("+pID+")");
+            Query<Pipe> query_for_pID ("pipe("+pID+")");
             size_t hash;
               {
-                PPipe pipe1 = Pipe::query (query_for_pID);
+                PPipe pipe1 = Session::current->defaults (query_for_pID);
                 hash = pipe1->getID();
               }
              // now AssetManager should have the only ref
@@ -148,9 +160,10 @@ namespace asset
             aMang.remove (assetID);
             ASSERT (!aMang.known (assetID));
             
-            TODO ("assure the bare default-query now fails...");
-            PPipe pipe2 = Session::current->defaults(Query<Pipe> (query_for_pID));
-            TODO ("assure the bare default-query now succeeds...");
+            
+            ASSERT (!find(query_for_pID));                              // bare default-query should fail...
+            PPipe pipe2 = Session::current->defaults (query_for_pID);   // triggers re-creation
+            ASSERT ( find(query_for_pID));                              // should succeed again
           }
       };
     
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 35ed4e339..0f3427f05 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -842,8 +842,8 @@ This is an very important external Interface, because it links together all thre
 <pre>[[ProcLayer and Engine]]
 </pre>
 </div>
-<div title="DefaultsImplementation" modifier="Ichthyostega" modified="200802200145" created="200802200043" tags="spec impl draft" changecount="6">
-<pre>As detailed in the [[definition|DefaultsManagement]], {{{default(Obj)}}} is sort of a Joker along the lines &quot;give me a suitable Object and I don't care for further details&quot;. Actually, default objects are implemented by the {{{mobject::session::DefsManager}}}, which remembers and keeps track of anything labeled as &quot;default&quot;. This defaults manager is a singleton and can be accessed via the [[Session]] interface, meaning that the memory regarding defaults is part of the session state. Accessing an object via the query for an default actually //tagges// this object (stores a weak ref in the ~DefsManager). Alongside with each object successfully queried via &quot;default&quot;, the degree of constriction is remembered, i.e. the number of additional conditions contained in the query. This enables us to search for default objects starting with the most unspecific.
+<div title="DefaultsImplementation" modifier="Ichthyostega" modified="200802290000" created="200802200043" tags="spec impl draft" changecount="10">
+<pre>As detailed in the [[definition|DefaultsManagement]], {{{default(Obj)}}} is sort of a Joker along the lines &quot;give me a suitable Object and I don't care for further details&quot;. Actually, default objects are implemented by the {{{mobject::session::DefsManager}}}, which remembers and keeps track of anything labeled as &quot;default&quot;. This defaults manager is a singleton and can be accessed via the [[Session]] interface, meaning that the memory track regarding defaults is part of the session state. Accessing an object via the query for an default actually //tagges// this object (storing a weak ref in the ~DefsManager). Alongside with each object successfully queried via &quot;default&quot;, the degree of constriction is remembered, i.e. the number of additional conditions contained in the query. This enables us to search for default objects starting with the most unspecific.
 
 !Skeleton
 # ''search'': using the predicate {{{default(X)}}} enumerates existing objects of suitable type
@@ -859,7 +859,7 @@ This is an very important external Interface, because it links together all thre
 
 !!!Implementation details
 Taken precisely, the &quot;degree of constriction&quot; yields only a partial ordering &amp;mdash; but as the &quot;default&quot;-predicate is sort of a existential quantification anyways, its sole purpose is to avoid polluting the session with unnecessary default objects, and we don't need to care for absolute precision. A suitable approximation is to count the number of predicates terms in the query and use a pqueue (separate for each Type) to store weak refs to the the objects tagged as &quot;default&quot;
-{{red{WARN}}} there is an interference with the (planned) Undo function. This is a general problem of the config queries; it seems reasonable we can ignore this issue.
+{{red{WARN}}} there is an interference with the (planned) Undo function. This is a general problem of the config queries; just ignoring this issue seems reasonable.
 
 !!!Problems with the (preliminary) mock implementation
 As we don't have a Prolog interpreter on board yet, we utilize a mock store with preconfigured answers. (see {{{MockConfigQuery}}}). As this preliminary solution is lacking the ability to create new objects, we need to resort to some trickery here (please look away). The overall logic is quite broken, because the system isn't capable to do any real resolution &amp;mdash; if we ignore this fact, the rest of the algorithm can be implemented, tested and used right now.

From a3d91286c87a2400b0d977a9df32e5c651ad6cdf Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 29 Feb 2008 18:58:29 +0100
Subject: [PATCH 08/36] WIP defaults manager implementation

---
 src/common/configrules.hpp                    | 24 +++---
 src/common/query/mockconfigrules.hpp          | 14 ++--
 src/proc/mobject/session/defsmanager.cpp      | 79 ++++++++++++++-----
 src/proc/mobject/session/defsmanager.hpp      |  4 +-
 src/proc/mobject/session/defsregistry.cpp     | 48 +++++++++++
 src/proc/mobject/session/defsregistry.hpp     | 68 ++++++++++++++++
 .../mobject/session/defsmanagerimpltest.cpp   |  6 --
 wiki/renderengine.html                        | 10 +--
 8 files changed, 206 insertions(+), 47 deletions(-)
 create mode 100644 src/proc/mobject/session/defsregistry.cpp
 create mode 100644 src/proc/mobject/session/defsregistry.hpp

diff --git a/src/common/configrules.hpp b/src/common/configrules.hpp
index 872d34724..4dcbef8c9 100644
--- a/src/common/configrules.hpp
+++ b/src/common/configrules.hpp
@@ -50,7 +50,7 @@
 #include "common/typelistutil.hpp"
 #include "common/singletonsubclass.hpp"
 
-//TODO: is it sensible to bring in the types explicitly here? (it's not necessary, but may be convienient...)
+//TODO: is it sensible to bring in the types explicitly here? (it's not necessary, but may be convenient...)
 #include "proc/mobject/session/track.hpp"
 #include "proc/asset/procpatt.hpp"
 #include "proc/asset/pipe.hpp"
@@ -73,11 +73,11 @@ namespace cinelerra
     {
     // The intention is to support the following style of Prolog code
     //
-    // retrieve(O, Cap) :- find(T), capabilities(Cap).
-    // retrieve(O, Cap) :- make(T), capabilities(Cap).
-    // capabilities(Q) :- call(Q).
-    //
-    // stream(T, mpeg) :- type(T, track), type(P, pipe), retrieve(P, stream(P,mpeg)), place_to(P, T).
+    //  resolve(O, Cap) :- find(O), capabilities(Cap).
+    //  resolve(O, Cap) :- make(O), capabilities(Cap).
+    //  capabilities(Q) :- call(Q).
+    //  
+    //  stream(T, mpeg) :- type(T, track), type(P, pipe), resolve(P, stream(P,mpeg)), place_to(P, T).
     //
     // The type guard is inserted auomatically, while the predicate implementations for
     // find/1, make/1, stream/2, and place_to/2 are to be provided by the target types.
@@ -111,6 +111,8 @@ namespace cinelerra
      * type of object. Registering  such a TypeHandler should create
      * the necessary handler functions to be installed into 
      * the Prolog system.
+     * @todo it can't be done exactly this way, but I leave it in
+     *       as a reminder for later, to show the intention
      */  
     template<class TY>
     class TypeHandler
@@ -128,7 +130,8 @@ namespace cinelerra
      * the "frontside" interface: the Proc-Layer code can
      * use this QueryHandler to retrieve instances of the
      * type TY fulfilling the given Query. To start with,
-     * we use a mock implementation-
+     * we use a mock implementation. 
+     * (this code works and is already used 2/2008)
      * @see cinelerra::query::LookupPreconfigured
      * @see cinelerra::query::MockTable
      */
@@ -140,9 +143,12 @@ namespace cinelerra
       public:
         /** try to find or create an object of type TY 
          *  fulfilling the given query.
-         *  @return empty shared-ptr if not found,
+         *  @param solution object fulfilling the query. Will be bound or
+         *         unified (in case it's already bound) with the first solution.
+         *  @query any goals to be fulfilled by the solution.
+         *  @return false if resolution failed. In this case, solution ptr is empty.
          */
-        virtual shared_ptr<TY> resolve (const Query<TY>& q) = 0;
+        virtual bool resolve (shared_ptr<TY> solution, const Query<TY>& q) = 0;
       };
 
     // TODO: the Idea is to provide specialisations for the concrete types
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index 51f4a4cb7..7466f7050 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -105,14 +105,18 @@ namespace cinelerra
         typedef typename WrapReturn<TY>::Wrapper Ret;
         
       public:
-        virtual Ret 
-        resolve (const Query<TY>& q)
+        /** (dummy) implementation of the QueryHandler interface */
+        virtual bool 
+        resolve (Ret& solution, const Query<TY>& q)
           {
             const any& entry = fetch_from_table_for (q.asKey());
             if (!isnil (entry))
-              return any_cast<Ret> (entry);
-            else
-              return Ret(); // default-constructed empty smart ptr
+              if (! solution
+                 ||(solution && *solution == *candidate)    // simulates a real unification
+                 )
+                return solution = candidate;
+            
+            return solution = Ret();    // fail: return default-constructed empty smart ptr
           }
       };
     
diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp
index 52b78437b..1a0107ff5 100644
--- a/src/proc/mobject/session/defsmanager.cpp
+++ b/src/proc/mobject/session/defsmanager.cpp
@@ -22,8 +22,7 @@
 
 
 #include "proc/mobject/session/defsmanager.hpp"
-#include "proc/asset/procpatt.hpp"
-#include "proc/asset/pipe.hpp"
+#include "proc/mobject/session/defsregistry.hpp"
 #include "common/configrules.hpp"
 #include "common/error.hpp"
 
@@ -32,52 +31,70 @@
 using boost::format;
 
 using asset::Query;
-using asset::Pipe;
-using asset::ProcPatt;
-using asset::PProcPatt;
-
 using cinelerra::ConfigRules;
 using cinelerra::query::QueryHandler;
 using cinelerra::query::CINELERRA_ERROR_CAPABILITY_QUERY;
 
+
 namespace mobject
   {
   namespace session
     {
     using std::tr1::shared_ptr;
     
+    
+    namespace // Implementation details
+      {
+      DefsRegistry& defaultsRegistry; //////////////////TODO
+    }
+    
     /** initialize the most basic internal defaults. */
     DefsManager::DefsManager ()  throw()
     {
       TODO ("setup basic defaults of the session");
     }
-
+    
+    
     template<class TAR>
-    shared_ptr<TAR> 
+    shared_ptr<TAR>
     DefsManager::search  (const Query<TAR>& capabilities)
     {
-      UNIMPLEMENTED ("search for default registered object, dont create");
+      defaultsRegistry.get (capabilities);
     }
     
+    
     template<class TAR>
     shared_ptr<TAR> 
     DefsManager::create  (const Query<TAR>& capabilities)
     {
-      UNIMPLEMENTED ("retrieve object and register as default");
+      shared_ptr<TAR> res;
+      QueryHandler<TAR>& typeHandler = ConfigRules::instance();  
+      typeHandler.resolve (res, capabilities);
+      if (res)
+        defaultsRegistry.put (res, capabilities);
+      return res;
     }
     
+    
     template<class TAR>
     bool 
-    DefsManager::define  (shared_ptr<TAR>& defaultObj, const Query<TAR>& capabilities)
+    DefsManager::define  (const shared_ptr<TAR>& defaultObj, const Query<TAR>& capabilities)
     {
-      UNIMPLEMENTED ("just do the defaults registration");
+      shared_ptr<TAR> candidate (defaultObj);
+      QueryHandler<TAR>& typeHandler = ConfigRules::instance();  
+      typeHandler.resolve (candidate, capabilities);
+      if (!candidate)
+        return false;
+      else
+        return defaultsRegistry.put (candidate, capabilities);
     }
-
+    
+    
     template<class TAR>
     bool 
-    DefsManager::forget  (shared_ptr<TAR>& defaultObj)
+    DefsManager::forget  (const shared_ptr<TAR>& defaultObj)
     {
-      UNIMPLEMENTED ("purge defaults registration");
+      defaultsRegistry.forget (defaultObj);
     }
 
     
@@ -85,9 +102,11 @@ namespace mobject
     shared_ptr<TAR> 
     DefsManager::operator() (const Query<TAR>& capabilities)
     {
-      TODO ("move this code to create()");
-      QueryHandler<TAR>& typeHandler = ConfigRules::instance();  
-      shared_ptr<TAR> res = typeHandler.resolve (capabilities);
+      shared_ptr<TAR> res (search (capabilities));
+      if (res) 
+        return res;
+      else
+        res = create (capabilities); // not yet known as default, create new
       
       if (!res)
         throw cinelerra::error::Config ( str(format("The following Query could not be resolved: %s.") 
@@ -97,14 +116,34 @@ namespace mobject
         return res;
     }
 
+  } // namespace mobject::session
+
+} // namespace mobject
     
     
    /***************************************************************/
    /* explicit template instantiations for querying various Types */
    /***************************************************************/
 
-    template shared_ptr<Pipe> DefsManager::operator ()(const Query<Pipe>&); 
-    template PProcPatt        DefsManager::operator ()(const Query<const ProcPatt>&); 
+#include "proc/asset/procpatt.hpp"
+#include "proc/asset/pipe.hpp"
+
+namespace mobject
+  {
+  namespace session
+    {
+
+    using asset::Pipe;
+    using asset::PPipe;
+    using asset::ProcPatt;
+    using asset::PProcPatt;
+    
+    
+    template PPipe     DefsManager::operator() (const Query<Pipe>&); 
+    template PProcPatt DefsManager::operator() (const Query<const ProcPatt>&); 
+    
+    template bool DefsManager::define (const PPipe&, const Query<Pipe>&);
+    template bool DefsManager::forget (const PPipe&);
 
   } // namespace mobject::session
 
diff --git a/src/proc/mobject/session/defsmanager.hpp b/src/proc/mobject/session/defsmanager.hpp
index 16c6a7bfc..3b01f6e6c 100644
--- a/src/proc/mobject/session/defsmanager.hpp
+++ b/src/proc/mobject/session/defsmanager.hpp
@@ -85,13 +85,13 @@ namespace mobject
          *  @note only a weak ref to the object is stored
          */ 
         template<class TAR>
-        bool define  (shared_ptr<TAR>&, const cinelerra::Query<TAR>&);
+        bool define  (const shared_ptr<TAR>&, const cinelerra::Query<TAR>&);
         
         /** remove the defaults registration of the given object, if there was such
          *  @return false if nothing has been changed because the object wasn't registered
          */
         template<class TAR>
-        bool forget  (shared_ptr<TAR>&);
+        bool forget  (const shared_ptr<TAR>&);
         
         
 // Q: can we have something along the line of...?
diff --git a/src/proc/mobject/session/defsregistry.cpp b/src/proc/mobject/session/defsregistry.cpp
new file mode 100644
index 000000000..c1d370bde
--- /dev/null
+++ b/src/proc/mobject/session/defsregistry.cpp
@@ -0,0 +1,48 @@
+/*
+  DefsManager  -  implementation of the default object store
+ 
+  Copyright (C)         CinelerraCV
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "proc/mobject/session/defsregistry.hpp"
+#include "common/error.hpp"
+
+//#include <boost/format.hpp>
+
+//using boost::format;
+
+
+
+namespace mobject
+  {
+  namespace session
+    {
+    
+    /** @todo */
+    DefsRegistry::DefsRegistry ()  throw()
+    {
+      UNIMPLEMENTED ("initialize store for default objects");
+    }
+    
+
+  } // namespace mobject::session
+
+} // namespace mobject
+
diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defsregistry.hpp
new file mode 100644
index 000000000..33b57b634
--- /dev/null
+++ b/src/proc/mobject/session/defsregistry.hpp
@@ -0,0 +1,68 @@
+/*
+  DEFSREGISTRY.hpp  -  implementation of the default object store
+ 
+  Copyright (C)         CinelerraCV
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+*/
+
+
+#ifndef MOBJECT_SESSION_DEFSREGISTRY_H
+#define MOBJECT_SESSION_DEFSREGISTRY_H
+
+
+#include "common/singleton.hpp"
+
+#include <tr1/memory>
+
+
+
+namespace mobject
+  {
+  namespace session
+    {
+    using std::tr1::shared_ptr;
+
+
+    /**
+     * Organize a collection of preconfigured default objects.
+     * For various kinds of objects we can tweek the default parametrisation
+     * as part of the general session configuration. A ref to an instance of
+     * this class is accessible through the current session and can be used
+     * to fill in parts of the configuration of new objects, if the user 
+     * code didn't give more specific parameters. Necessary sub-objects 
+     * will be created on demand, and any default configuration, once
+     * found, will be remembered and stored with the current session.
+     */
+    class DefsRegistry
+      {
+      protected:
+        
+        DefsRegistry ();
+        friend class cinelerra::singleton::StaticCreate<SessManagerImpl>;
+        
+      public:
+        
+      };
+
+      
+
+  } // namespace mobject::session
+
+} // namespace mobject
+
+#endif
diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
index 920da9467..dc0cc22a4 100644
--- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
@@ -51,12 +51,6 @@ namespace asset
     using cinelerra::query::QueryHandler;
     
     
-    /** shortcut: query without creating new instances */
-    bool 
-    find (Query<Pipe>& q) 
-    { 
-      return Session::current->defaults.search (q); 
-    }
     
     /** shortcut: query for given Pipe-ID */
     bool 
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 0f3427f05..f1de96a22 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -2512,21 +2512,21 @@ Like all [[structural assets|StructAsset]], ~ProcPatt employs a special naming s
 <pre>a given Render Engine configuration is a list of Processors. Each Processor in turn contains a Graph of ProcNode.s to do the acutal data processing. In order to cary out any calculations, the Processor needs to be called with a StateProxy containing the state information for this RenderProcess
 </pre>
 </div>
-<div title="QueryImplProlog" modifier="Ichthyostega" modified="200802192354" created="200801202321" tags="draft design" changecount="15">
+<div title="QueryImplProlog" modifier="Ichthyostega" modified="200802291526" created="200801202321" tags="draft design" changecount="17">
 <pre>//obviously, getting this one to work requires quite a lot of technical details to be planned and implemented.// This said...
 The intention is to get much more readable (&quot;declarative&quot;) and changeable configuration as by programming the decision logic literately within the implementation of some object.
 
 !Draft
 As an example, specifying how a Track can be configured for connecting automatically to some &quot;mpeg&quot; bus (=pipe)
 {{{
-retrieve(O, Cap) :- find(O), capabilities(Cap).
-retrieve(O, Cap) :- make(O), capabilities(Cap).
+resolve(O, Cap) :- find(O), capabilities(Cap).
+resolve(O, Cap) :- make(O), capabilities(Cap).
 capabilities(Q) :- call(Q).
 
-stream(T, mpeg) :- type(T, track), type(P, pipe), retrieve(P, stream(P,mpeg)), place_to(P, T).
+stream(T, mpeg) :- type(T, track), type(P, pipe), resolve(P, stream(P,mpeg)), place_to(P, T).
 }}}
 
-Then, running the goal {{{:-retrieve(T, stream(T,mpeg)).}}} would search a Track object, try to retrieve a pipe object with stream-type=mpeg and associate the track with this pipe. This relies on a predicate &quot;stream(P,mpeg)&quot; implemented (natively) for the pipe object. So, &quot;Cap&quot; is the query issued from calling code &amp;mdash; here {{{stream(T,mpeg)}}}, the type guard {{{type(T, track)}}} will probably be handled or inserted automatically, while the predicate implementations for find/1, make/1, stream/2, and place_to/2 are to be provided by the target types.
+Then, running the goal {{{:-resolve(T, stream(T,mpeg)).}}} would search a Track object, try to retrieve a pipe object with stream-type=mpeg and associate the track with this pipe. This relies on a predicate &quot;stream(P,mpeg)&quot; implemented (natively) for the pipe object. So, &quot;Cap&quot; is the query issued from calling code &amp;mdash; here {{{stream(T,mpeg)}}}, the type guard {{{type(T, track)}}} will probably be handled or inserted automatically, while the predicate implementations for find/1, make/1, stream/2, and place_to/2 are to be provided by the target types.
 * __The supporting system__ had to combine several code snippets into one rule system to be used for running queries, with some global base rules, rules injected by each individual participating object kind and finally user provided rules added by the current session. The actual query is bound to &quot;Cap&quot; (and consequently run as a goal by {{{call(Q)}}}). The implementation needs to provide a symbol table associating variable terms (like &quot;T&quot; or &quot;P&quot;) to C/C++ object types, enabling the participating object kinds to register their specific predicate implementations. This is crucial, because there can be no general scheme of object-provided predicates (for each object kind different predicates make sense, e.g. [[pipes|PipeHandling]] have other possibilities than [[wiring requests|WiringRequest]]). Basically, a query issues a Prolog goal, which in turn evaluates domain specific predicates provided by the participating objects and thus calls back into C/C++ code. The supporting system maintains the internal connection (via the &quot;type&quot; predicate) such that from Prolog viewpoint it looks as if we were binding Variables directly to object instances. (there are some nasty technical details because of the backtracking nature of Prolog evaluations which need to be hidden away)
 * Any __participating object kind__ needs a way to declare domain specific predicates, thus triggering the registration of the necessary hooks within the supporting system. Moreover, it should be able to inject further prolog code (as shown in the example above with the {{{strem(T, mpeg)}}} predicate. For each of these new domain specific predicates, there needs to be a functor which can be invoked when the C implementation of the predicate is called from Prolog (in some cases even later, when the final solution is &quot;executed&quot;, e.g. a new instance has been created and now some properties need to be set).
 

From 0baf15ca94e88d9ee6b511a18ef48daad87427ba Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 10 Mar 2008 04:25:03 +0100
Subject: [PATCH 09/36] Cinelerra-3 renamed to Lumiera -- copyright and
 documentation

---
 AUTHORS                                       |   4 +-
 DIR_INFO                                      |   2 +-
 INSTALL                                       |   4 +-
 LICENSE                                       |  11 +--
 Makefile.am                                   |   2 +-
 README                                        |  29 +++---
 SConstruct                                    |   6 +-
 admin/scons/Buildhelper.py                    |   4 +-
 configure.ac                                  |   6 +-
 doc/devel/Doxyfile                            |   9 +-
 doc/devel/uml/class128138.html                |   2 +-
 doc/devel/uml/class128266.html                |   2 +-
 doc/devel/uml/class128394.html                |   2 +-
 doc/devel/uml/class135429.html                |   2 +-
 doc/devel/uml/class136453.html                |   2 +-
 doc/devel/uml/classdiagrams.html              |   2 +-
 doc/devel/uml/classes.html                    |   6 +-
 doc/devel/uml/fig129797.png                   | Bin 18443 -> 18260 bytes
 doc/devel/uml/fig130053.png                   | Bin 44088 -> 19189 bytes
 doc/devel/uml/fig130181.png                   | Bin 10688 -> 10701 bytes
 doc/devel/uml/index-withframe.html            |   2 +-
 doc/devel/uml/index.html                      |  22 ++---
 doc/devel/uml/index_60.html                   |   4 +-
 doc/devel/uml/index_65.html                   |   6 +-
 doc/devel/uml/index_66.html                   |   2 +-
 doc/devel/uml/index_67.html                   |  44 +++++----
 doc/devel/uml/index_69.html                   |   6 +-
 doc/devel/uml/index_70.html                   |   2 +-
 doc/devel/uml/index_71.html                   |   2 +-
 doc/devel/uml/index_72.html                   |   2 +-
 doc/devel/uml/index_73.html                   |   4 +-
 doc/devel/uml/index_76.html                   |   2 +
 doc/devel/uml/index_77.html                   |   2 +-
 doc/devel/uml/index_79.html                   |   6 +-
 doc/devel/uml/index_82.html                   |   2 +-
 doc/devel/uml/index_83.html                   |   2 +-
 doc/devel/uml/index_84.html                   |   6 +-
 doc/devel/uml/index_86.html                   |  16 ++--
 doc/devel/uml/navig.html                      |   2 +-
 doc/devel/uml/packages.html                   |   6 +-
 doc/devel/uml/public_properties.html          |   2 +-
 src/backend/mediaaccessfacade.cpp             |   4 +-
 src/backend/mediaaccessfacade.hpp             |   4 +-
 src/cinelerra.h                               |   4 +-
 src/common/appconfig.cpp                      |   4 +-
 src/common/appconfig.hpp                      |   4 +-
 src/common/cmdline.cpp                        |   4 +-
 src/common/cmdline.hpp                        |   4 +-
 src/common/error.cpp                          |   4 +-
 src/common/error.hpp                          |   4 +-
 src/common/factory.hpp                        |   4 +-
 src/common/multithread.hpp                    |   4 +-
 src/common/singleton.hpp                      |   4 +-
 src/common/singletonfactory.hpp               |   4 +-
 src/common/singletonpolicies.hpp              |   4 +-
 src/common/singletonpreconfigure.hpp          |   4 +-
 src/common/test/mockinjector.hpp              |   4 +-
 src/common/test/run.hpp                       |   4 +-
 src/common/test/suite.cpp                     |   4 +-
 src/common/test/suite.hpp                     |   4 +-
 src/common/test/testoption.cpp                |   4 +-
 src/common/test/testoption.hpp                |   4 +-
 src/common/time.cpp                           |   4 +-
 src/common/time.hpp                           |   4 +-
 src/common/typelist.hpp                       |   4 +-
 src/common/util.cpp                           |   4 +-
 src/common/util.hpp                           |   4 +-
 src/common/visitor.cpp                        |   4 +-
 src/common/visitor.hpp                        |   4 +-
 src/common/visitordispatcher.hpp              |   4 +-
 src/common/visitorpolicies.hpp                |   4 +-
 src/lib/Makefile.am                           |   2 +-
 src/lib/condition.c                           |   4 +-
 src/lib/condition.h                           |   4 +-
 src/lib/error.c                               |   4 +-
 src/lib/error.h                               |   4 +-
 src/lib/framerate.c                           |   4 +-
 src/lib/framerate.h                           |   4 +-
 src/lib/llist.h                               |   4 +-
 src/lib/locking.h                             |   4 +-
 src/lib/mutex.c                               |   4 +-
 src/lib/mutex.h                               |   4 +-
 src/lib/plugin.c                              |   4 +-
 src/lib/plugin.h                              |   4 +-
 src/lib/references.c                          |   4 +-
 src/lib/references.h                          |   4 +-
 src/lib/rwlock.c                              |   4 +-
 src/lib/rwlock.h                              |   4 +-
 src/lib/time.c                                |   4 +-
 src/lib/time.h                                |   4 +-
 src/main.cpp                                  |   8 +-
 src/nobugcfg.h                                |   4 +-
 src/pre.hpp                                   |   4 +-
 src/proc/asset.cpp                            |   4 +-
 src/proc/asset.hpp                            |   6 +-
 src/proc/asset/buildinstruct.cpp              |   4 +-
 src/proc/asset/buildinstruct.hpp              |   4 +-
 src/proc/asset/category.cpp                   |   4 +-
 src/proc/asset/category.hpp                   |   4 +-
 src/proc/asset/clip.cpp                       |   4 +-
 src/proc/asset/clip.hpp                       |   4 +-
 src/proc/asset/codec.cpp                      |   4 +-
 src/proc/asset/codec.hpp                      |   4 +-
 src/proc/asset/compoundmedia.cpp              |   4 +-
 src/proc/asset/compoundmedia.hpp              |   4 +-
 src/proc/asset/dataset.cpp                    |   4 +-
 src/proc/asset/dataset.hpp                    |   4 +-
 src/proc/asset/db.hpp                         |   4 +-
 src/proc/asset/effect.cpp                     |   4 +-
 src/proc/asset/effect.hpp                     |   4 +-
 src/proc/asset/media.cpp                      |   4 +-
 src/proc/asset/media.hpp                      |   4 +-
 src/proc/asset/meta.cpp                       |   4 +-
 src/proc/asset/meta.hpp                       |   4 +-
 src/proc/asset/outport.cpp                    |   4 +-
 src/proc/asset/outport.hpp                    |   4 +-
 src/proc/asset/preview.cpp                    |   4 +-
 src/proc/asset/preview.hpp                    |   4 +-
 src/proc/asset/proc.cpp                       |   4 +-
 src/proc/asset/proc.hpp                       |   4 +-
 src/proc/asset/procpatt.cpp                   |   4 +-
 src/proc/asset/procpatt.hpp                   |   4 +-
 src/proc/asset/struct.cpp                     |   4 +-
 src/proc/asset/struct.hpp                     |   4 +-
 src/proc/asset/track.cpp                      |   4 +-
 src/proc/asset/track.hpp                      |   4 +-
 src/proc/asset/unknown.cpp                    |   4 +-
 src/proc/asset/unknown.hpp                    |   4 +-
 src/proc/assetmanager.cpp                     |   4 +-
 src/proc/assetmanager.hpp                     |   4 +-
 src/proc/controllerfacade.cpp                 |   4 +-
 src/proc/controllerfacade.hpp                 |   4 +-
 src/proc/engine/aframe.cpp                    |   4 +-
 src/proc/engine/aframe.hpp                    |   4 +-
 src/proc/engine/arender.cpp                   |   4 +-
 src/proc/engine/arender.hpp                   |   4 +-
 src/proc/engine/codecadapter.cpp              |   4 +-
 src/proc/engine/codecadapter.hpp              |   4 +-
 src/proc/engine/exitnode.cpp                  |   4 +-
 src/proc/engine/exitnode.hpp                  |   4 +-
 src/proc/engine/glbuf.cpp                     |   4 +-
 src/proc/engine/glbuf.hpp                     |   4 +-
 src/proc/engine/glpipe.cpp                    |   4 +-
 src/proc/engine/glpipe.hpp                    |   4 +-
 src/proc/engine/glrender.cpp                  |   4 +-
 src/proc/engine/glrender.hpp                  |   4 +-
 src/proc/engine/hub.cpp                       |   4 +-
 src/proc/engine/hub.hpp                       |   4 +-
 src/proc/engine/link.cpp                      |   4 +-
 src/proc/engine/link.hpp                      |   4 +-
 src/proc/engine/mask.cpp                      |   4 +-
 src/proc/engine/mask.hpp                      |   4 +-
 src/proc/engine/pluginadapter.cpp             |   4 +-
 src/proc/engine/pluginadapter.hpp             |   4 +-
 src/proc/engine/processor.cpp                 |   4 +-
 src/proc/engine/processor.hpp                 |   4 +-
 src/proc/engine/procnode.cpp                  |   4 +-
 src/proc/engine/procnode.hpp                  |   4 +-
 src/proc/engine/projector.cpp                 |   4 +-
 src/proc/engine/projector.hpp                 |   4 +-
 src/proc/engine/renderengine.cpp              |   4 +-
 src/proc/engine/renderengine.hpp              |   4 +-
 src/proc/engine/source.cpp                    |   4 +-
 src/proc/engine/source.hpp                    |   4 +-
 src/proc/engine/trafo.cpp                     |   4 +-
 src/proc/engine/trafo.hpp                     |   4 +-
 src/proc/engine/vframe.cpp                    |   4 +-
 src/proc/engine/vframe.hpp                    |   4 +-
 src/proc/engine/vrender.cpp                   |   4 +-
 src/proc/engine/vrender.hpp                   |   4 +-
 src/proc/frame.cpp                            |   4 +-
 src/proc/frame.hpp                            |   4 +-
 src/proc/mobject/builder/assembler.cpp        |   4 +-
 src/proc/mobject/builder/assembler.hpp        |   4 +-
 src/proc/mobject/builder/buildertool.hpp      |   4 +-
 src/proc/mobject/builder/conmanager.cpp       |   4 +-
 src/proc/mobject/builder/conmanager.hpp       |   4 +-
 src/proc/mobject/builder/nodecreatertool.cpp  |   4 +-
 src/proc/mobject/builder/nodecreatertool.hpp  |   4 +-
 src/proc/mobject/builder/segmentationtool.cpp |   4 +-
 src/proc/mobject/builder/segmentationtool.hpp |   4 +-
 src/proc/mobject/builder/toolfactory.cpp      |   4 +-
 src/proc/mobject/builder/toolfactory.hpp      |   4 +-
 src/proc/mobject/builderfacade.cpp            |   4 +-
 src/proc/mobject/builderfacade.hpp            |   4 +-
 src/proc/mobject/controller/pathmanager.cpp   |   4 +-
 src/proc/mobject/controller/pathmanager.hpp   |   4 +-
 src/proc/mobject/controller/renderstate.cpp   |   4 +-
 src/proc/mobject/controller/renderstate.hpp   |   4 +-
 src/proc/mobject/explicitplacement.hpp        |   4 +-
 src/proc/mobject/interpolator.cpp             |   4 +-
 src/proc/mobject/interpolator.hpp             |   4 +-
 src/proc/mobject/mobject.cpp                  |   4 +-
 src/proc/mobject/mobject.hpp                  |   4 +-
 src/proc/mobject/parameter.cpp                |   4 +-
 src/proc/mobject/parameter.hpp                |   4 +-
 src/proc/mobject/paramprovider.cpp            |   4 +-
 src/proc/mobject/paramprovider.hpp            |   4 +-
 src/proc/mobject/placement.cpp                |   4 +-
 src/proc/mobject/placement.hpp                |   4 +-
 src/proc/mobject/session.hpp                  |   4 +-
 src/proc/mobject/session/abstractmo.cpp       |   4 +-
 src/proc/mobject/session/abstractmo.hpp       |   4 +-
 src/proc/mobject/session/allocation.cpp       |   4 +-
 src/proc/mobject/session/allocation.hpp       |   4 +-
 src/proc/mobject/session/auto.cpp             |   4 +-
 src/proc/mobject/session/auto.hpp             |   4 +-
 src/proc/mobject/session/clip.cpp             |   4 +-
 src/proc/mobject/session/clip.hpp             |   4 +-
 src/proc/mobject/session/compoundclip.cpp     |   4 +-
 src/proc/mobject/session/compoundclip.hpp     |   4 +-
 src/proc/mobject/session/edl.cpp              |   4 +-
 src/proc/mobject/session/edl.hpp              |   4 +-
 src/proc/mobject/session/effect.cpp           |   4 +-
 src/proc/mobject/session/effect.hpp           |   4 +-
 src/proc/mobject/session/fixedlocation.cpp    |   4 +-
 src/proc/mobject/session/fixedlocation.hpp    |   4 +-
 src/proc/mobject/session/fixture.cpp          |   4 +-
 src/proc/mobject/session/fixture.hpp          |   4 +-
 src/proc/mobject/session/label.cpp            |   4 +-
 src/proc/mobject/session/label.hpp            |   4 +-
 src/proc/mobject/session/locatingpin.cpp      |   4 +-
 src/proc/mobject/session/locatingpin.hpp      |   4 +-
 src/proc/mobject/session/meta.cpp             |   4 +-
 src/proc/mobject/session/meta.hpp             |   4 +-
 src/proc/mobject/session/mobjectfactory.cpp   |   4 +-
 src/proc/mobject/session/mobjectfactory.hpp   |   4 +-
 src/proc/mobject/session/relativelocation.cpp |   4 +-
 src/proc/mobject/session/relativelocation.hpp |   4 +-
 src/proc/mobject/session/segment.cpp          |   4 +-
 src/proc/mobject/session/segment.hpp          |   4 +-
 src/proc/mobject/session/session.cpp          |   4 +-
 src/proc/mobject/session/sessionimpl.cpp      |   4 +-
 src/proc/mobject/session/sessionimpl.hpp      |   4 +-
 src/proc/mobject/session/sessmanagerimpl.cpp  |   4 +-
 src/proc/mobject/session/simpleclip.cpp       |   4 +-
 src/proc/mobject/session/simpleclip.hpp       |   4 +-
 src/proc/mobject/session/track.cpp            |   4 +-
 src/proc/mobject/session/track.hpp            |   4 +-
 src/proc/stateproxy.cpp                       |   4 +-
 src/proc/stateproxy.hpp                       |   4 +-
 tests/Makefile.am                             |   2 +-
 tests/bugs/bugmain.c                          |   4 +-
 tests/components/backend/mediaaccessmock.cpp  |   4 +-
 tests/components/backend/mediaaccessmock.hpp  |   4 +-
 .../backend/mediaaccessmocktest.cpp           |   4 +-
 tests/components/common/appconfigtest.cpp     |   4 +-
 .../components/common/exceptionerrortest.cpp  |   4 +-
 .../components/common/factoryspecialtest.cpp  |   4 +-
 tests/components/common/factorytest.cpp       |   4 +-
 .../common/sanitizedidentifiertest.cpp        |   4 +-
 tests/components/common/singletontest.cpp     |   4 +-
 .../common/singletontestmocktest.cpp          |   4 +-
 .../common/test/cmdlinewrappertest.cpp        |   4 +-
 .../components/common/test/testoptiontest.cpp |   4 +-
 tests/components/common/testtargetobj.hpp     |   4 +-
 tests/components/common/typelisttest.cpp      |   4 +-
 .../components/common/visitingtoolconcept.cpp |   4 +-
 .../common/visitingtoolextendedtest.cpp       |   4 +-
 tests/components/common/visitingtooltest.cpp  |   4 +-
 tests/components/helloworldtest.cpp           |   4 +-
 tests/components/mainsuite.cpp                |   4 +-
 .../proc/asset/assetcategorytest.cpp          |   4 +-
 .../proc/asset/assetdiagnostics.hpp           |   4 +-
 .../proc/asset/compoundmediatest.cpp          |   4 +-
 .../components/proc/asset/createassettest.cpp |   4 +-
 .../components/proc/asset/deleteassettest.cpp |   4 +-
 .../proc/asset/dependantassetstest.cpp        |   4 +-
 .../proc/asset/identityofassetstest.cpp       |   4 +-
 tests/components/proc/asset/makecliptest.cpp  |   4 +-
 .../proc/asset/mediastructurequerytest.cpp    |   4 +-
 .../proc/asset/orderingofassetstest.cpp       |   4 +-
 tests/components/proc/asset/testasset.cpp     |   4 +-
 tests/components/proc/asset/testasset.hpp     |   4 +-
 tests/components/proc/asset/testclipasset.hpp |   4 +-
 .../components/proc/engine/sourcenodetest.cpp |   4 +-
 .../proc/mobject/builder/buildertooltest.cpp  |   4 +-
 .../proc/mobject/builder/buildsegmenttest.cpp |   4 +-
 .../mobject/controller/rendersegmenttest.cpp  |   4 +-
 .../proc/mobject/placementbasictest.cpp       |   4 +-
 .../proc/mobject/session/addcliptest.cpp      |   4 +-
 .../proc/mobject/session/deletecliptest.cpp   |   4 +-
 .../mobject/session/rebuildfixturetest.cpp    |   4 +-
 .../mobject/session/sessionmanagertest.cpp    |   4 +-
 .../mobject/session/sessionstructuretest.cpp  |   4 +-
 .../proc/mobject/session/testclip.cpp         |   4 +-
 .../proc/mobject/session/testclip.hpp         |   4 +-
 .../proc/mobject/session/testsession1.hpp     |   4 +-
 tests/error/errortest.c                       |   4 +-
 tests/library/test-llist.c                    |   4 +-
 tests/library/test-references.c               |   4 +-
 tests/locking/condition.c                     |   4 +-
 tests/locking/mutex.c                         |   4 +-
 tests/locking/test-condition.c                |   4 +-
 tests/locking/test-locking.c                  |   4 +-
 tests/plugin/Makefile.am                      |   2 +-
 tests/test.sh                                 |   2 +-
 tests/time/test-time.c                        |   4 +-
 uml/cinelerra3/DIR_INFO                       |   1 -
 uml/{cinelerra3 => lumiera}/128005            |   2 +-
 uml/{cinelerra3 => lumiera}/128005.diagram    |   0
 uml/{cinelerra3 => lumiera}/128133            |   2 +-
 uml/{cinelerra3 => lumiera}/128133.diagram    |   0
 uml/{cinelerra3 => lumiera}/128138            |   0
 uml/{cinelerra3 => lumiera}/128181.diagram    |   0
 uml/{cinelerra3 => lumiera}/128261            |   0
 uml/{cinelerra3 => lumiera}/128261.diagram    |   0
 uml/{cinelerra3 => lumiera}/128389            |   0
 uml/{cinelerra3 => lumiera}/128389.diagram    |   0
 uml/{cinelerra3 => lumiera}/128517            |  10 +-
 uml/{cinelerra3 => lumiera}/128517.diagram    |   0
 uml/{cinelerra3 => lumiera}/128645            |   4 +-
 uml/{cinelerra3 => lumiera}/128645.diagram    |   0
 uml/{cinelerra3 => lumiera}/128773            |   0
 uml/{cinelerra3 => lumiera}/128773.diagram    |   0
 uml/{cinelerra3 => lumiera}/128901            |   0
 uml/{cinelerra3 => lumiera}/128901.diagram    |   0
 uml/{cinelerra3 => lumiera}/129029            |   0
 uml/{cinelerra3 => lumiera}/129029.diagram    |   0
 uml/{cinelerra3 => lumiera}/129157            |   0
 uml/{cinelerra3 => lumiera}/129157.diagram    |   0
 uml/{cinelerra3 => lumiera}/129285            |   0
 uml/{cinelerra3 => lumiera}/129285.diagram    |   0
 uml/{cinelerra3 => lumiera}/129413            |   4 +-
 uml/{cinelerra3 => lumiera}/129413.diagram    |   0
 uml/{cinelerra3 => lumiera}/129541            |   0
 uml/{cinelerra3 => lumiera}/129541.diagram    |   0
 uml/{cinelerra3 => lumiera}/129669            |   0
 uml/{cinelerra3 => lumiera}/129669.diagram    |   0
 uml/{cinelerra3 => lumiera}/129797            |   0
 uml/{cinelerra3 => lumiera}/129797.diagram    |   2 +-
 uml/{cinelerra3 => lumiera}/129925            |   0
 uml/{cinelerra3 => lumiera}/129925.diagram    |   0
 uml/{cinelerra3 => lumiera}/130053            |   0
 uml/{cinelerra3 => lumiera}/130053.diagram    |   0
 uml/{cinelerra3 => lumiera}/130181            |   0
 uml/{cinelerra3 => lumiera}/130181.diagram    |   0
 uml/{cinelerra3 => lumiera}/130309            |   0
 uml/{cinelerra3 => lumiera}/130309.diagram    |   0
 uml/{cinelerra3 => lumiera}/130437            |   0
 uml/{cinelerra3 => lumiera}/130437.diagram    |   0
 uml/{cinelerra3 => lumiera}/130565            |   0
 uml/{cinelerra3 => lumiera}/130693            |   0
 uml/{cinelerra3 => lumiera}/130693.diagram    |   0
 uml/{cinelerra3 => lumiera}/130821            |   2 +-
 uml/{cinelerra3 => lumiera}/130821.diagram    |   0
 uml/{cinelerra3 => lumiera}/130949            |   2 +-
 uml/{cinelerra3 => lumiera}/130949.diagram    |   0
 uml/{cinelerra3 => lumiera}/131077.diagram    |   0
 uml/{cinelerra3 => lumiera}/131205.diagram    |   0
 uml/{cinelerra3 => lumiera}/131333.diagram    |   0
 uml/{cinelerra3 => lumiera}/134021.bodies     |   0
 uml/{cinelerra3 => lumiera}/5.session         |   4 +-
 uml/lumiera/DIR_INFO                          |   1 +
 uml/{cinelerra3 => lumiera}/cpp_includes      |   0
 .../generation_settings                       |   0
 uml/{cinelerra3 => lumiera}/idl_includes      |   0
 uml/{cinelerra3 => lumiera}/java_imports      |   0
 .../cinelerra3.prj => lumiera/lumiera.prj}    |   6 +-
 uml/{cinelerra3 => lumiera}/stereotypes       |   0
 uml/{cinelerra3 => lumiera}/tools             |   0
 wiki/backend.html                             |  10 +-
 wiki/index.html                               |  82 ++++++++--------
 wiki/renderengine.html                        |  36 +++----
 wiki/support_library.html                     |  88 +++++++++---------
 365 files changed, 761 insertions(+), 758 deletions(-)
 delete mode 100644 uml/cinelerra3/DIR_INFO
 rename uml/{cinelerra3 => lumiera}/128005 (98%)
 rename uml/{cinelerra3 => lumiera}/128005.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128133 (99%)
 rename uml/{cinelerra3 => lumiera}/128133.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128138 (100%)
 rename uml/{cinelerra3 => lumiera}/128181.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128261 (100%)
 rename uml/{cinelerra3 => lumiera}/128261.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128389 (100%)
 rename uml/{cinelerra3 => lumiera}/128389.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128517 (98%)
 rename uml/{cinelerra3 => lumiera}/128517.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128645 (98%)
 rename uml/{cinelerra3 => lumiera}/128645.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128773 (100%)
 rename uml/{cinelerra3 => lumiera}/128773.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/128901 (100%)
 rename uml/{cinelerra3 => lumiera}/128901.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/129029 (100%)
 rename uml/{cinelerra3 => lumiera}/129029.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/129157 (100%)
 rename uml/{cinelerra3 => lumiera}/129157.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/129285 (100%)
 rename uml/{cinelerra3 => lumiera}/129285.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/129413 (98%)
 rename uml/{cinelerra3 => lumiera}/129413.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/129541 (100%)
 rename uml/{cinelerra3 => lumiera}/129541.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/129669 (100%)
 rename uml/{cinelerra3 => lumiera}/129669.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/129797 (100%)
 rename uml/{cinelerra3 => lumiera}/129797.diagram (96%)
 rename uml/{cinelerra3 => lumiera}/129925 (100%)
 rename uml/{cinelerra3 => lumiera}/129925.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/130053 (100%)
 rename uml/{cinelerra3 => lumiera}/130053.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/130181 (100%)
 rename uml/{cinelerra3 => lumiera}/130181.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/130309 (100%)
 rename uml/{cinelerra3 => lumiera}/130309.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/130437 (100%)
 rename uml/{cinelerra3 => lumiera}/130437.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/130565 (100%)
 rename uml/{cinelerra3 => lumiera}/130693 (100%)
 rename uml/{cinelerra3 => lumiera}/130693.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/130821 (98%)
 rename uml/{cinelerra3 => lumiera}/130821.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/130949 (98%)
 rename uml/{cinelerra3 => lumiera}/130949.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/131077.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/131205.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/131333.diagram (100%)
 rename uml/{cinelerra3 => lumiera}/134021.bodies (100%)
 rename uml/{cinelerra3 => lumiera}/5.session (89%)
 create mode 100644 uml/lumiera/DIR_INFO
 rename uml/{cinelerra3 => lumiera}/cpp_includes (100%)
 rename uml/{cinelerra3 => lumiera}/generation_settings (100%)
 rename uml/{cinelerra3 => lumiera}/idl_includes (100%)
 rename uml/{cinelerra3 => lumiera}/java_imports (100%)
 rename uml/{cinelerra3/cinelerra3.prj => lumiera/lumiera.prj} (97%)
 rename uml/{cinelerra3 => lumiera}/stereotypes (100%)
 rename uml/{cinelerra3 => lumiera}/tools (100%)

diff --git a/AUTHORS b/AUTHORS
index da64efbcd..e950124df 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,8 +29,8 @@ doudou=Sylvain Joyeux <doudou@melix.net>
 rafael2k=Rafael Diniz <rafael@riseup.net>
 nicolasm=Nicolas Maufrais <e.conti@gmx.net>
 
-Involved in Design Studies / Prototypes for Cinelerra-3
-=======================================================
+Involved in Lumiera development
+===============================
 cehteh=Christian Thaeter <ct@pipapo.org>
 ichthyo=Hermann Vosseler <Ichthyostega@web.de>
 plouj=Michael Ploujnikov <ploujj@gmail.com>
diff --git a/DIR_INFO b/DIR_INFO
index 39fd1850f..f05e9a881 100644
--- a/DIR_INFO
+++ b/DIR_INFO
@@ -1 +1 @@
-The root dir for the cinelerra3 project
+The root dir for the Lumiera project
diff --git a/INSTALL b/INSTALL
index c6cf3ff92..7983166ec 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Running / Installing Cinelerra-3 Prototype
-==========================================
+Running / Installing Lumiera Prototype
+======================================
 
 ** to be written **
 
diff --git a/LICENSE b/LICENSE
index b93cee22f..4a684524d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,17 +1,10 @@
-The Cinelerra source code is (C) by the original authors (see AUTHORS)
+The Lumiera source code is (C) by the original authors (see AUTHORS)
 
 =======================================================================
-Cinelerra is free software -- you may use and redistribute it under the
+Lumiera is free software -- you may use and redistribute it under the
 Terms and conditions of the GNU GENERAL PUBLIC LICENSE (GPL); 
 either version 2 of the License, or (at your option) any later version.
 =======================================================================
 For a copy of the GPL Version 2 see the file "COPYING"
       
 
-In addition to the GPL's warranty stipulation, Cinelerra is distributed WITHOUT
-GUARANTEED SUPPORT; without even the guarantee of ADDITIONAL LABOR. Support
-that is not guaranteed includes technical support, compiler troubleshooting,
-debugging, version matching, updating, among other additional labor which
-may or may not be required to meet a user's requirements.
-
-
diff --git a/Makefile.am b/Makefile.am
index 9b03ecb54..236a67f8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C)         CinelerraCV
+#  Copyright (C)         Lumiera.org
 #    2007,               Christian Thaeter <ct@pipapo.org>
 #
 #  This program is free software; you can redistribute it and/or
diff --git a/README b/README
index 0ab5fe3ae..7913094ee 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
-======================================
-Cinelerra -- the video NLE for Linux
-======================================
+====================================
+Lumiera -- the video NLE for Linux
+====================================
 
- Cinelerra is a nonlinear video editing and compositing tool. 
+ Lumiera is a nonlinear video editing and compositing tool. 
  It understands some of the common multimedia formats
  (quicktime, avi, ogg) and audio/video compression
  codecs (divx, xvid, mpeg1/2/4, ...)
@@ -12,23 +12,30 @@ Cinelerra -- the video NLE for Linux
  and RGB-float colormodels and the ability to mix media
  with differing sizes and framerates.
 
+For more information about Lumiera visit http://lumiera.org/
 For more information about Cinelerra visit http://cinelerra.org/
 
 
-------------------------------
-"Cinelerra-3" prototype code
-------------------------------
+----------------------------
+"Lumiera" prototype code
+----------------------------
 
-**This source tree doesn't contain a working video editing application**
-Rather, it contains some design studies and prototype code for improving
-some aspects of the Cinelerra Application. This work may eventually 
-evolve into a new major release of Cinelerra.
+**This source tree doesn't yet contain a working video editing application**
+Rather, it contains the initial framework and core modules of the lower and
+middle layer of the envisioned new Application "Lumiera".
 
 As of 7/2007, we start here with some backend and render engine modules
 together with some unit tests. You should find a wiki with detailed
 design considerations and developer documentation and a UML model
 (usable with BOUML 2.29) in the sibling directories.
 
+As of 2/2008 the project has been separated completely from his ancestor "Cinelerra"
+The Community, which is largely identical to the Cinelerra-CV community, choose the
+new project name "Lumiera". The basic project infrastructure is up and running,
+and work on the new codebase is going on continuosely. We can show nothing but
+a running test suite for now. 
+
+
 
 Build Requirements
 ------------------
diff --git a/SConstruct b/SConstruct
index 5dc55580a..f3f9f0ddc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3,8 +3,8 @@
 ## SConstruct  -  SCons based build-sytem for Cinelerra
 ##
 
-#  Copyright (C)         CinelerraCV
-#    2007,               Hermann Vosseler <Ichthyostega@web.de>
+#  Copyright (C)         Lumiera.org
+#    2008,               Hermann Vosseler <Ichthyostega@web.de>
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
@@ -134,7 +134,7 @@ def defineCmdlineOptions():
 def prepareOptionsHelp(opts,env):
     prelude = """
 USAGE:   scons [-c] [OPTS] [key=val [key=val...]] [TARGETS]
-     Build and optionally install Cinelerra.
+     Build and optionally install Lumiera.
      Without specifying any target, just the (re)build target will run.
      Add -c to the commandline to clean up anything a given target would produce
 
diff --git a/admin/scons/Buildhelper.py b/admin/scons/Buildhelper.py
index 419de6e68..f37cff630 100644
--- a/admin/scons/Buildhelper.py
+++ b/admin/scons/Buildhelper.py
@@ -3,8 +3,8 @@
 ## Buildhelper.py  -  helpers, custom builders, for SConstruct
 ##
 
-#  Copyright (C)         CinelerraCV
-#    2007,               Hermann Vosseler <Ichthyostega@web.de>
+#  Copyright (C)         Lumiera.org
+#    2008,               Hermann Vosseler <Ichthyostega@web.de>
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
diff --git a/configure.ac b/configure.ac
index 1730b3bdc..386bd94b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
-AC_INIT(cinelerra, 3.0pre)
+AC_INIT(lumiera, 0.1pre)
 AC_CONFIG_SRCDIR(src/lib/plugin.c)
 AC_CONFIG_AUX_DIR(scripts)
 AM_INIT_AUTOMAKE
 AC_PREREQ(2.59)
 
 AC_COPYRIGHT([
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/doc/devel/Doxyfile b/doc/devel/Doxyfile
index 7023172ca..2f90301f0 100644
--- a/doc/devel/Doxyfile
+++ b/doc/devel/Doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = Cinelerra3
+PROJECT_NAME           = Lumiera
 PROJECT_NUMBER         = 3.0+alpha
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = YES
@@ -153,9 +153,10 @@ VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = cinelerra:: \
-                         cinelerra_ \
-                         CINELERRA_
+IGNORE_PREFIX          = lumiera:: \
+                         lumiera_ \
+                         lumi_ \
+                         LUMIERA_
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
diff --git a/doc/devel/uml/class128138.html b/doc/devel/uml/class128138.html
index cf9db4338..6cbff1e37 100644
--- a/doc/devel/uml/class128138.html
+++ b/doc/devel/uml/class128138.html
@@ -16,5 +16,5 @@
 <!-- ============================================================= -->
 
 <a name="refclass128138"></a>
-<p>Declaration :</p><ul><li>C++ : class Thread </li></ul><p>We can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads <br /></p></body>
+<p>Declaration :</p><ul><li>C++ : class Thread </li></ul><p>We can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads <br /></p></body>
 </html>
diff --git a/doc/devel/uml/class128266.html b/doc/devel/uml/class128266.html
index f4fa4ec54..be0f14da2 100644
--- a/doc/devel/uml/class128266.html
+++ b/doc/devel/uml/class128266.html
@@ -16,7 +16,7 @@
 <!-- ============================================================= -->
 
 <a name="refclass128266"></a>
-<p>Declaration :</p><ul><li>C++ : class Condition </li></ul><p>I provided a reworked Condition class in my cinelerra2 repository<br /></p><div class="sub">
+<p>Declaration :</p><ul><li>C++ : class Condition </li></ul><p>I provided a reworked Condition class in my Cinelerra2 repository<br /></p><div class="sub">
 <table><tr><td><div class="element">Class <b><a href="class128522.html#refclass128522"><b>Lock</b></a></b></div></td></tr></table>
 </div>
 </body>
diff --git a/doc/devel/uml/class128394.html b/doc/devel/uml/class128394.html
index a82ace25d..7b7e1a826 100644
--- a/doc/devel/uml/class128394.html
+++ b/doc/devel/uml/class128394.html
@@ -16,7 +16,7 @@
 <!-- ============================================================= -->
 
 <a name="refclass128394"></a>
-<p>Declaration :</p><ul><li>C++ : class Mutex </li></ul><p>I provided a reworked Mutex class in my cinelerra2 repository<br /></p><div class="sub">
+<p>Declaration :</p><ul><li>C++ : class Mutex </li></ul><p>I provided a reworked Mutex class in my Cinelerra2 repository<br /></p><div class="sub">
 <table><tr><td><div class="element">Class <b><a href="class128650.html#refclass128650"><b>Lock</b></a></b></div></td></tr></table>
 </div>
 </body>
diff --git a/doc/devel/uml/class135429.html b/doc/devel/uml/class135429.html
index 93f554a39..538ad35b0 100644
--- a/doc/devel/uml/class135429.html
+++ b/doc/devel/uml/class135429.html
@@ -20,7 +20,7 @@
 <a name="refattribute130181"></a>
 <table><tr><td><div class="element">Attribut <b>theApp_</b></div></td></tr></table>
 <p>Declaration :</p><ul><li>Uml : static, - theApp_ : <a href="class135429.html#refclass135429"><b>Appconfig</b></a></li><li>C++ : private: static <a href="class135429.html#refclass135429"><b>Appconfig</b></a> theApp_</li></ul><p>holds the single instance and triggers initialization<br /></p><a name="refoperation131333"></a>
-<table><tr><td><div class="element">Operation <b>Appconfig</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : - Appconfig() : </li><li>C++ : private: Appconfig () </li></ul><p>perform initialization on first access. <br />A call is placed in static initialization code<br />included in cinelerra.h<br /></p><a name="refoperation131461"></a>
+<table><tr><td><div class="element">Operation <b>Appconfig</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : - Appconfig() : </li><li>C++ : private: Appconfig () </li></ul><p>perform initialization on first access. <br />A call is placed in static initialization code<br />included in lumiera.h<br /></p><a name="refoperation131461"></a>
 <table><tr><td><div class="element">Operation <b>instance</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : static, - instance() : Appconfig*</li><li>C++ : private: static Appconfig* instance () </li></ul><a name="refoperation131589"></a>
 <table><tr><td><div class="element">Operation <b>get</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : static, + get(inout key : string) : string</li><li>C++ : public: static string get (string &amp; key) </li></ul><p>access the configuation value for a given key.<br />@return empty string for unknown keys, else the corresponding configuration value<br /></p></div>
 <p>All public operations : <a href="class135429.html#refoperation131589"><b>get</b></a> </p>
diff --git a/doc/devel/uml/class136453.html b/doc/devel/uml/class136453.html
index 525aaa684..610053bbe 100644
--- a/doc/devel/uml/class136453.html
+++ b/doc/devel/uml/class136453.html
@@ -25,7 +25,7 @@
 <p>Declaration :</p><ul><li>Uml : + name : string</li><li>C++ : public: const string name</li></ul><p>element ID, comprehensible but sanitized. The tuple (category, name, org) is unique.<br /></p><a name="refrelation140421"></a>
 <table><tr><td><div class="element">Relation <b>category (&lt;unidirectional association&gt;)</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : + category : <a href="class137221.html#refclass137221"><b>Category</b></a>, multiplicity : 1</li><li>C++ : public: const <a href="class137221.html#refclass137221"><b>Category</b></a>* category</li></ul><p>primary tree like classification of the asset<br /></p><a name="refattribute130821"></a>
 <table><tr><td><div class="element">Attribut <b>org</b></div></td></tr></table>
-<p>Declaration :</p><ul><li>Uml : + org : string</li><li>C++ : public: const string org</li></ul><p>origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core cinelerra-3 codebase is "cin3".<br /></p><a name="refattribute130949"></a>
+<p>Declaration :</p><ul><li>Uml : + org : string</li><li>C++ : public: const string org</li></ul><p>origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core Lumiera codebase is "lumi".<br /></p><a name="refattribute130949"></a>
 <table><tr><td><div class="element">Attribut <b>version</b></div></td></tr></table>
 <p>Declaration :</p><ul><li>Uml : + version : uint</li><li>C++ : public: const unsigned int version</li></ul><p>version number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions.<br /></p><a name="refattribute131077"></a>
 <table><tr><td><div class="element">Attribut <b>groups</b></div></td></tr></table>
diff --git a/doc/devel/uml/classdiagrams.html b/doc/devel/uml/classdiagrams.html
index 63f1a4fcf..03c862119 100644
--- a/doc/devel/uml/classdiagrams.html
+++ b/doc/devel/uml/classdiagrams.html
@@ -21,7 +21,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram129285" target = "projectFrame"><b>Builder Entities</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128645" target = "projectFrame"><b>Controller Entities</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128181" target = "projectFrame"><b>File Mapping</b></a></td><td></td><td>Shows whats used to access Frames</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram130181" target = "projectFrame"><b>Hierarchy</b></a></td><td></td><td>Cinelerra Exception hierarchy</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram130181" target = "projectFrame"><b>Hierarchy</b></a></td><td></td><td>Lumiera Exception hierarchy</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128309" target = "projectFrame"><b>In Memory Database</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram130949" target = "projectFrame"><b>interface components</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram130437" target = "projectFrame"><b>Media-Asset Relations</b></a></td><td></td><td></td></tr>
diff --git a/doc/devel/uml/classes.html b/doc/devel/uml/classes.html
index 48c1ea2d6..d2f240eb9 100644
--- a/doc/devel/uml/classes.html
+++ b/doc/devel/uml/classes.html
@@ -37,7 +37,7 @@
 <tr bgcolor=#f0f0f0><td><a href="class135045.html#refclass135045" target = "projectFrame"><b>CodecAdapter</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138629.html#refclass138629" target = "projectFrame"><b>CompoundClip</b></a></td><td></td><td>Clip MObject which is actually a compound of several elementary clips,<br />e.g. the several streams found within multichannels media.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138501.html#refclass138501" target = "projectFrame"><b>CompoundMedia</b></a></td><td></td><td>compound of several elementary media tracks,<br />e.g. the individual media streams found in one media file</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class128266.html#refclass128266" target = "projectFrame"><b>Condition</b></a></td><td></td><td>I provided a reworked Condition class in my cinelerra2 repository</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class128266.html#refclass128266" target = "projectFrame"><b>Condition</b></a></td><td></td><td>I provided a reworked Condition class in my Cinelerra2 repository</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135813.html#refclass135813" target = "projectFrame"><b>Config</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130821.html#refclass130821" target = "projectFrame"><b>ConManager</b></a></td><td></td><td>Connection Manager, used to build the connections between render engine nodes, if these nodes need to cooperate besides the normal "data pull" operation. Esp., the Connection Manager knows how to wire up the effect's parameters with the corresponding ParamProviders (autmation) in the Session</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130181.html#refclass130181" target = "projectFrame"><b>Constraint</b></a></td><td></td><td></td></tr>
@@ -86,7 +86,7 @@
 <tr bgcolor=#f0f0f0><td><a href="class137093.html#refclass137093" target = "projectFrame"><b>Meta</b></a></td><td></td><td>key abstraction: metadata and organisational asset</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129157.html#refclass129157" target = "projectFrame"><b>Meta</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128517.html#refclass128517" target = "projectFrame"><b>MObject</b></a></td><td>interface</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class128394.html#refclass128394" target = "projectFrame"><b>Mutex</b></a></td><td></td><td>I provided a reworked Mutex class in my cinelerra2 repository</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class128394.html#refclass128394" target = "projectFrame"><b>Mutex</b></a></td><td></td><td>I provided a reworked Mutex class in my Cinelerra2 repository</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134405.html#refclass134405" target = "projectFrame"><b>NodeCreatorTool</b></a></td><td></td><td>This Tool implementation plays the central role in the buld process: given a MObject from Session, it is able to attach ProcNodes to the render engine under construction such as to reflect the properties of the MObject in the actual render.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134533.html#refclass134533" target = "projectFrame"><b>Parameter</b></a></td><td></td><td>Descriptor and access object for a plugin parameter. Parameters may be provided with values from the session, and this values may be automated.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134661.html#refclass134661" target = "projectFrame"><b>ParamProvider</b></a></td><td>interface</td><td>A facility to get the actual value of a plugin/effect parameter</td></tr>
@@ -119,7 +119,7 @@
 <tr bgcolor=#f0f0f0><td><a href="class132741.html#refclass132741" target = "projectFrame"><b>StateProxy</b></a></td><td>interface</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136325.html#refclass136325" target = "projectFrame"><b>std::exception</b></a></td><td>auxiliary</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136965.html#refclass136965" target = "projectFrame"><b>Struct</b></a></td><td></td><td>key abstraction: structural asset</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class128138.html#refclass128138" target = "projectFrame"><b>Thread</b></a></td><td></td><td>We can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads </td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class128138.html#refclass128138" target = "projectFrame"><b>Thread</b></a></td><td></td><td>We can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads </td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134917.html#refclass134917" target = "projectFrame"><b>Time</b></a></td><td></td><td>denotes a temporal position (time point), based on timeline start.<br /><br />investigate posix.4 realtime timers, wrap these here</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class140037.html#refclass140037" target = "projectFrame"><b>Tool</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130693.html#refclass130693" target = "projectFrame"><b>ToolFactory</b></a></td><td></td><td></td></tr>
diff --git a/doc/devel/uml/fig129797.png b/doc/devel/uml/fig129797.png
index e38a4cb77f27d773ec2fc418ec88b48ce2442195..229233231f800c5fc87227e88b5d09f278a16d4a 100644
GIT binary patch
literal 18260
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

literal 18443
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
AO#lD@

diff --git a/doc/devel/uml/fig130053.png b/doc/devel/uml/fig130053.png
index 9e6810f94a1b94bea64180fc070e3aee068b21ae..9cee6c87a85330b18e5e63a988ec21e80931c4b2 100644
GIT binary patch
literal 19189
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
K%REu75C0F%JULPT

literal 44088
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

diff --git a/doc/devel/uml/fig130181.png b/doc/devel/uml/fig130181.png
index 692da89b9574479fcef96bfb380b86494dc56398..fbd802a8954d5e9ef97671ae6f02b2e4a088b67e 100644
GIT binary patch
literal 10701
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
D*S$T#

literal 10688
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
VjNKLr1Sc~g3Nos&g2%?M{tLK6dmR7(

diff --git a/doc/devel/uml/index-withframe.html b/doc/devel/uml/index-withframe.html
index cf6c2c73f..9844745f9 100644
--- a/doc/devel/uml/index-withframe.html
+++ b/doc/devel/uml/index-withframe.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>/mnt/Lager/heim/devel/cin3/doc/devel/uml/index-withframe</title>
+<title>/mnt/Lager/heim/devel/lumi/doc/devel/uml/index-withframe</title>
 <link rel="stylesheet" href="style.css" type="text/css" />
 </head>
 <FRAMESET cols="20%,80%">
diff --git a/doc/devel/uml/index.html b/doc/devel/uml/index.html
index 3853e7c4f..406fc303d 100644
--- a/doc/devel/uml/index.html
+++ b/doc/devel/uml/index.html
@@ -4,14 +4,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>cinelerra3
+<title>lumiera
 Documentation</title>
 <link rel="stylesheet" href="style.css" type="text/css" />
 </head>
 
 <body bgcolor="#ffffff">
 
-<div class = "title">cinelerra3<br />Documentation</div>
+<div class = "title">lumiera<br />Documentation</div>
 <p></p>
 
 <!-- ============================================================= -->
@@ -22,7 +22,7 @@ Documentation</title>
 <p>All things concering the big picture.<br />Not a real code package, rather a container for design drafts, specifications, decisions.<br /></p><div class="sub">
 <a name="refcomponent view128005"></a>
 <h2 class ="view">1.1 Component View Architecture</h2>
-<p>The various Components comprising the Cinelerra3 Video editing Application<br /></p>
+<p>The various Components comprising the Lumiera Video editing Application<br /></p>
 <div class="sub">
 <a name="refcomponent diagram128005"></a>
 <p align="center"><img src="fig128005.png" alt="" /></p>
@@ -104,15 +104,15 @@ Documentation</title>
 <p>This package is used to organize code generation by BOUML. It is considered useless after having generated the initial code skeleton.<br /></p><div class="sub">
 <a name="refdeployment view128133"></a>
 <h3 class ="view">1.3.1 Deployment View EXE Deployment</h3>
-<p>defines and lists how the Cinelerra executable has to be created<br /></p>
+<p>defines and lists how the Lumiera executable has to be created<br /></p>
 <div class="sub">
 <a name="refdeployment diagram129797"></a>
 <p align="center"><img src="fig129797.png" alt="" /></p>
  <p align="center"><b>Source Overview</b></p><p><br /></p><p><br /></p>
 <a name="refartifact128005"></a>
-<table><tr><td><div class="element">Artifact <b>Cinelerra3</b></div></td></tr></table>
+<table><tr><td><div class="element">Artifact <b>Lumiera</b></div></td></tr></table>
 <p>Depends on <a href="index.html#refpackage129413"><b>common</b></a></p><p>Depends on <a href="index.html#refpackage129797"><b>gui</b></a></p><p>Depends on <a href="index.html#refpackage129669"><b>proc</b></a></p><p>Depends on <a href="index.html#refpackage129541"><b>backend</b></a></p><p>the main executable to be built<br /></p>
-<p><i>executable</i> associated with : <a href="index.html#refartifact128133"><b>main</b></a>, <a href="index.html#refartifact130693"><b>conmanager</b></a>, <a href="index.html#refartifact129413"><b>clip</b></a>, <a href="index.html#refartifact129669"><b>meta</b></a>, <a href="index.html#refartifact129797"><b>fixedlocation</b></a>, <a href="index.html#refartifact129925"><b>relativelocation</b></a>, <a href="index.html#refartifact133509"><b>vrender</b></a>, <a href="index.html#refartifact128261"><b>mobject</b></a>, <a href="index.html#refartifact134277"><b>source</b></a>, <a href="index.html#refartifact133765"><b>frame</b></a>, <a href="index.html#refartifact129029"><b>placement</b></a>, <a href="index.html#refartifact128517"><b>sessionimpl</b></a>, <a href="index.html#refartifact130437"><b>builderfacade</b></a>, <a href="index.html#refartifact131589"><b>controllerfacade</b></a>, <a href="index.html#refartifact132101"><b>processor</b></a>, <a href="index.html#refartifact133125"><b>pluginadapter</b></a>, <a href="index.html#refartifact129541"><b>effect</b></a>, <a href="index.html#refartifact131205"><b>buildertool</b></a>, <a href="index.html#refartifact131333"><b>segmentationtool</b></a>, <a href="index.html#refartifact133893"><b>aframe</b></a>, <a href="index.html#refartifact130821"><b>assembler</b></a>, <a href="index.html#refartifact132485"><b>trafo</b></a>, <a href="index.html#refartifact129157"><b>explicitplacement</b></a>, <a href="index.html#refartifact130309"><b>auto</b></a>, <a href="index.html#refartifact133637"><b>glrender</b></a>, <a href="index.html#refartifact132613"><b>link</b></a>, <a href="index.html#refartifact134405"><b>parameter</b></a>, <a href="index.html#refartifact131973"><b>renderengine</b></a>, <a href="index.html#refartifact130053"><b>allocation</b></a>, <a href="index.html#refartifact134021"><b>vframe</b></a>, <a href="index.html#refartifact130565"><b>toolfactory</b></a>, <a href="index.html#refartifact133381"><b>arender</b></a>, <a href="index.html#refartifact131845"><b>renderstate</b></a>, <a href="index.html#refartifact130181"><b>label</b></a>, <a href="index.html#refartifact134149"><b>glbuf</b></a>, <a href="index.html#refartifact132357"><b>procnode</b></a>, <a href="index.html#refartifact130949"><b>stateproxy</b></a>, <a href="index.html#refartifact132741"><b>hub</b></a>, <a href="index.html#refartifact131077"><b>buildable</b></a>, <a href="index.html#refartifact129285"><b>abstractmo</b></a>, <a href="index.html#refartifact131461"><b>nodecreatertool</b></a>, <a href="index.html#refartifact132869"><b>projector</b></a>, <a href="index.html#refartifact134661"><b>interpolator</b></a>, <a href="index.html#refartifact128645"><b>edl</b></a>, <a href="index.html#refartifact128773"><b>fixture</b></a>, <a href="index.html#refartifact133253"><b>glpipe</b></a>, <a href="index.html#refartifact132229"><b>exitnode</b></a>, <a href="index.html#refartifact131717"><b>pathmanager</b></a>, <a href="index.html#refartifact128901"><b>track</b></a>, <a href="index.html#refartifact134533"><b>paramprovider</b></a>, <a href="index.html#refartifact132997"><b>mask</b></a></p>
+<p><i>executable</i> associated with : <a href="index.html#refartifact132229"><b>exitnode</b></a>, <a href="index.html#refartifact131717"><b>pathmanager</b></a>, <a href="index.html#refartifact128901"><b>track</b></a>, <a href="index.html#refartifact134533"><b>paramprovider</b></a>, <a href="index.html#refartifact132997"><b>mask</b></a>, <a href="index.html#refartifact128133"><b>main</b></a>, <a href="index.html#refartifact130693"><b>conmanager</b></a>, <a href="index.html#refartifact129413"><b>clip</b></a>, <a href="index.html#refartifact129669"><b>meta</b></a>, <a href="index.html#refartifact129797"><b>fixedlocation</b></a>, <a href="index.html#refartifact129925"><b>relativelocation</b></a>, <a href="index.html#refartifact128261"><b>mobject</b></a>, <a href="index.html#refartifact134277"><b>source</b></a>, <a href="index.html#refartifact133765"><b>frame</b></a>, <a href="index.html#refartifact129029"><b>placement</b></a>, <a href="index.html#refartifact128517"><b>sessionimpl</b></a>, <a href="index.html#refartifact130437"><b>builderfacade</b></a>, <a href="index.html#refartifact131589"><b>controllerfacade</b></a>, <a href="index.html#refartifact132101"><b>processor</b></a>, <a href="index.html#refartifact133125"><b>pluginadapter</b></a>, <a href="index.html#refartifact129541"><b>effect</b></a>, <a href="index.html#refartifact131205"><b>buildertool</b></a>, <a href="index.html#refartifact131333"><b>segmentationtool</b></a>, <a href="index.html#refartifact133893"><b>aframe</b></a>, <a href="index.html#refartifact130821"><b>assembler</b></a>, <a href="index.html#refartifact132485"><b>trafo</b></a>, <a href="index.html#refartifact129157"><b>explicitplacement</b></a>, <a href="index.html#refartifact130309"><b>auto</b></a>, <a href="index.html#refartifact133637"><b>glrender</b></a>, <a href="index.html#refartifact132613"><b>link</b></a>, <a href="index.html#refartifact134405"><b>parameter</b></a>, <a href="index.html#refartifact131973"><b>renderengine</b></a>, <a href="index.html#refartifact130053"><b>allocation</b></a>, <a href="index.html#refartifact134021"><b>vframe</b></a>, <a href="index.html#refartifact130565"><b>toolfactory</b></a>, <a href="index.html#refartifact133381"><b>arender</b></a>, <a href="index.html#refartifact131845"><b>renderstate</b></a>, <a href="index.html#refartifact130181"><b>label</b></a>, <a href="index.html#refartifact134149"><b>glbuf</b></a>, <a href="index.html#refartifact132357"><b>procnode</b></a>, <a href="index.html#refartifact130949"><b>stateproxy</b></a>, <a href="index.html#refartifact132741"><b>hub</b></a>, <a href="index.html#refartifact131077"><b>buildable</b></a>, <a href="index.html#refartifact129285"><b>abstractmo</b></a>, <a href="index.html#refartifact131461"><b>nodecreatertool</b></a>, <a href="index.html#refartifact132869"><b>projector</b></a>, <a href="index.html#refartifact134661"><b>interpolator</b></a>, <a href="index.html#refartifact128645"><b>edl</b></a>, <a href="index.html#refartifact128773"><b>fixture</b></a>, <a href="index.html#refartifact133253"><b>glpipe</b></a>, <a href="index.html#refartifact133509"><b>vrender</b></a></p>
 <a name="refartifact128133"></a>
 <table><tr><td><div class="element">Artifact <b>main</b></div></td></tr></table>
 <p>Artifact <i>source</i></p>
@@ -120,7 +120,7 @@ Documentation</title>
 <a name="refpackage129413"></a>
 <h3 class ="package">1.3.2 Package common</h3>
 <p></p><ul>
-<li>C++ namespace : cinelerra</li>
+<li>C++ namespace : lumiera</li>
 </ul>
 <p>sourcecode package<br /><br />Common library and helper classes<br /></p><p>Diagram : <a href="index.html#refdeployment diagram129797"><b>Source Overview</b></a></p>
 <div class="sub">
@@ -134,7 +134,7 @@ Documentation</title>
 <p>Artifact <i>source</i> associated with : <a href="class140165.html#refclass140165"><b>Visitable</b></a>, <a href="class140037.html#refclass140037"><b>Tool</b></a>, <a href="class140293.html#refclass140293"><b>Applicable</b></a></p>
 <a name="refartifact135813"></a>
 <table><tr><td><div class="element">Artifact <b>error</b></div></td></tr></table>
-<p>Cinelerra Exception Interface<br /></p>
+<p>Lumiera Exception Interface<br /></p>
 <p>Artifact <i>source</i> associated with : <a href="class135557.html#refclass135557"><b>Error</b></a>, <a href="class135685.html#refclass135685"><b>Logic</b></a>, <a href="class135813.html#refclass135813"><b>Config</b></a>, <a href="class135941.html#refclass135941"><b>State</b></a>, <a href="class136069.html#refclass136069"><b>Invalid</b></a>, <a href="class136197.html#refclass136197"><b>External</b></a></p>
 <a name="refartifact135173"></a>
 <table><tr><td><div class="element">Artifact <b>appconfig</b></div></td></tr></table>
@@ -148,12 +148,12 @@ Documentation</title>
 <a name="refpackage130821"></a>
 <h4 class ="package">1.3.2.2 Package error</h4>
 <p></p><ul>
-<li>C++ namespace : cinelerra::error</li>
+<li>C++ namespace : lumiera::error</li>
 </ul>
 <p>Namespace for Exception Kinds<br /></p><a name="refpackage130949"></a>
 <h4 class ="package">1.3.2.3 Package visitor</h4>
 <p></p><ul>
-<li>C++ namespace : cinelerra::visitor</li>
+<li>C++ namespace : lumiera::visitor</li>
 </ul>
 <p>sub-namespace for visitor library implementation<br /></p></div>
 <a name="refpackage129541"></a>
@@ -1143,7 +1143,7 @@ reuse exiting Engine</pre></li></ul><p>Selection :</p><ul></ul><p>Transformation
 <a name="refclass diagram130181"></a>
 <p align="center"><img src="fig130181.png" alt="" /></p>
  <p align="center"><b>Hierarchy</b></p><p><br /></p><p><br /></p>
-<p>Cinelerra Exception hierarchy<br /></p><table><tr><td><div class="element">Class <b><a href="class135557.html#refclass135557"><b>Error</b></a></b></div></td></tr></table>
+<p>Lumiera Exception hierarchy<br /></p><table><tr><td><div class="element">Class <b><a href="class135557.html#refclass135557"><b>Error</b></a></b></div></td></tr></table>
 <table><tr><td><div class="element">Class <b><a href="class135685.html#refclass135685"><b>Logic</b></a></b></div></td></tr></table>
 <table><tr><td><div class="element">Class <b><a href="class135813.html#refclass135813"><b>Config</b></a></b></div></td></tr></table>
 <table><tr><td><div class="element">Class <b><a href="class135941.html#refclass135941"><b>State</b></a></b></div></td></tr></table>
diff --git a/doc/devel/uml/index_60.html b/doc/devel/uml/index_60.html
index 75ccc147d..a873c25b0 100644
--- a/doc/devel/uml/index_60.html
+++ b/doc/devel/uml/index_60.html
@@ -17,8 +17,8 @@
 
 <table>
 <tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#reftransition129541" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition129797" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#reftransition129541" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition129669" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130309" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131205" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
@@ -28,8 +28,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131461" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130693" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition129029" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131717" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130181" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131717" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131077" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130949" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130053" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
diff --git a/doc/devel/uml/index_65.html b/doc/devel/uml/index_65.html
index d570a1c71..cb80221e6 100644
--- a/doc/devel/uml/index_65.html
+++ b/doc/devel/uml/index_65.html
@@ -28,13 +28,13 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact130053" target = "projectFrame"><b>allocation</b></a></td><td>artifact</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129541.html#refclass129541" target = "projectFrame"><b>Allocation</b></a></td><td>class</td><td>a directive to place a MObject in a specific way</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation130565" target = "projectFrame"><b>anchor</b></a></td><td>relation</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation131333" target = "projectFrame"><b>Appconfig</b></a></td><td>operation</td><td>perform initialization on first access. <br />A call is placed in static initialization code<br />included in cinelerra.h; thus it will happen<br />ubiquitous very early.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation131333" target = "projectFrame"><b>Appconfig</b></a></td><td>operation</td><td>perform initialization on first access. <br />A call is placed in static initialization code<br />included in lumiera.h; thus it will happen<br />ubiquitous very early.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact135173" target = "projectFrame"><b>appconfig</b></a></td><td>artifact</td><td>for global initialization and configuration </td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135429.html#refclass135429" target = "projectFrame"><b>Appconfig</b></a></td><td>class</td><td>Singleton to hold inevitable global flags and constants and for performing erarly (static) global initialization tasks.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class140293.html#refclass140293" target = "projectFrame"><b>Applicable</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation129669" target = "projectFrame"><b>apply</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134789" target = "projectFrame"><b>apply</b></a></td><td>operation</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent view128005" target = "projectFrame"><b>Architecture</b></a></td><td>component view</td><td>The various Components comprising the Cinelerra3 Video editing Application</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent view128005" target = "projectFrame"><b>Architecture</b></a></td><td>component view</td><td>The various Components comprising the Lumiera Video editing Application</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class132869.html#refclass132869" target = "projectFrame"><b>ARender</b></a></td><td>class</td><td>Representation of a Audio render process</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact133381" target = "projectFrame"><b>arender</b></a></td><td>artifact</td><td>Representation of a Audio Render process</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class131077.html#refclass131077" target = "projectFrame"><b>Assembler</b></a></td><td>class</td><td>This is the actual building facility: provided the correct tools and associations, it serves to build and connect the individual ProcNode objects</td></tr>
@@ -54,9 +54,9 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128773" target = "projectFrame"><b>aud_A</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131845" target = "projectFrame"><b>aud_a</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131205" target = "projectFrame"><b>audio</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128901" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130821" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128389" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128901" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact130309" target = "projectFrame"><b>auto</b></a></td><td>artifact</td><td>Media Object holding automation data</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129925.html#refclass129925" target = "projectFrame"><b>Auto</b></a></td><td>class</td><td>Automation data for some parameter (i.e. a time varying function)</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram129669" target = "projectFrame"><b>Automation Entities</b></a></td><td>class diagram</td><td></td></tr>
diff --git a/doc/devel/uml/index_66.html b/doc/devel/uml/index_66.html
index 9158c65e4..2d9540c91 100644
--- a/doc/devel/uml/index_66.html
+++ b/doc/devel/uml/index_66.html
@@ -34,8 +34,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact131077" target = "projectFrame"><b>buildable</b></a></td><td>artifact</td><td>marker interface denoting any MObject able to be treated by Tools</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation128517" target = "projectFrame"><b>buildEngine</b></a></td><td>operation</td><td>Main Operation of the Builder: create a render engine for a given part of the timeline</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128005" target = "projectFrame"><b>Builder</b></a></td><td>component</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130565" target = "projectFrame"><b>builder</b></a></td><td>package</td><td>sourcecode package<br /><br />The Builder creating the Render Engine,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128901" target = "projectFrame"><b>Builder</b></a></td><td>package</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130565" target = "projectFrame"><b>builder</b></a></td><td>package</td><td>sourcecode package<br /><br />The Builder creating the Render Engine,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram129285" target = "projectFrame"><b>Builder Entities</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128261" target = "projectFrame"><b>Builder Workings</b></a></td><td>class view</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130565.html#refclass130565" target = "projectFrame"><b>BuilderFacade</b></a></td><td>class</td><td>Provides unified access to the builder functionality. While individual components of the builder subsystem may be called if necessary or suitable, it is usually better to do all extern invocations via the high level methods of this Facade</td></tr>
diff --git a/doc/devel/uml/index_67.html b/doc/devel/uml/index_67.html
index dfc4fc2d8..93dc372e2 100644
--- a/doc/devel/uml/index_67.html
+++ b/doc/devel/uml/index_67.html
@@ -23,39 +23,37 @@
 <tr bgcolor=#f0f0f0><td><a href="class137221.html#refclass137221" target = "projectFrame"><b>Category</b></a></td><td>class</td><td>tree like classification of Assets</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact135941" target = "projectFrame"><b>category</b></a></td><td>artifact</td><td>tree like classification of Assets</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130309" target = "projectFrame"><b>cause</b></a></td><td>attribute</td><td>a copy of the first exception encountered in this exception chain</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refrelation145413" target = "projectFrame"><b>chain</b></a></td><td>relation</td><td>Chain of additional Placements further constraining the position of this MObject</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134277" target = "projectFrame"><b>chain</b></a></td><td>operation</td><td>create and add another Placement for this media object, thus increasingly constraining the (possible) position of this object.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refrelation145413" target = "projectFrame"><b>chain</b></a></td><td>relation</td><td>Chain of additional Placements further constraining the position of this MObject</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation129633" target = "projectFrame"><b>checked_in</b></a></td><td>relation</td><td>checked_in objects are subject of cache aging and must be not in use</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation129290" target = "projectFrame"><b>checked_out</b></a></td><td>relation</td><td>this list keeps all mappings which are in use, and thus prevents them from Cache aging</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact128005" target = "projectFrame"><b>Cinelerra3</b></a></td><td>artifact</td><td>the main executable to be built</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129" target = "projectFrame"><b>cinelerra3</b></a></td><td>package</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134789" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134917" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135045" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135173" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135301" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135429" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134789" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135557" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135685" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135813" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134661" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130693" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135301" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135045" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135429" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135685" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135173" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135813" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131589" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132229" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129797" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128133" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128005" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128261" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129541" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130565" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132357" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130437" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129029" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132485" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130309" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130181" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130053" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129797" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129541" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131589" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132229" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132357" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132485" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133509" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128261" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128005" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128133" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129029" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130693" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129285" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation133765" target = "projectFrame"><b>clear</b></a></td><td>operation</td><td>clear current session contents <br />without resetting overall session config.<br />Afterwards, the session will contain only one <br />empty EDL, while all Assets are retained.<br /></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class137349.html#refclass137349" target = "projectFrame"><b>Clip</b></a></td><td>class</td><td>bookkeeping (asset) view of a media clip.</td></tr>
@@ -77,7 +75,7 @@
 <tr bgcolor=#f0f0f0><td><a href="class138629.html#refclass138629" target = "projectFrame"><b>CompoundClip</b></a></td><td>class</td><td>Clip MObject which is actually a compound of several elementary clips,<br />e.g. the several streams found within multichannels media.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138501.html#refclass138501" target = "projectFrame"><b>CompoundMedia</b></a></td><td>class</td><td>compound of several elementary media tracks,<br />e.g. the individual media streams found in one media file</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact138245" target = "projectFrame"><b>compoundmedia</b></a></td><td>artifact</td><td>a special clip as a compound of several elementary media tracks,<br />e.g. the individual media streams found in one media file</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class128266.html#refclass128266" target = "projectFrame"><b>Condition</b></a></td><td>class</td><td>I provided a reworked Condition class in my cinelerra2 repository</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class128266.html#refclass128266" target = "projectFrame"><b>Condition</b></a></td><td>class</td><td>I provided a reworked Condition class in my Cinelerra2 repository</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135813.html#refclass135813" target = "projectFrame"><b>Config</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case view128261" target = "projectFrame"><b>config examples</b></a></td><td>use case view</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation128773" target = "projectFrame"><b>configure</b></a></td><td>operation</td><td></td></tr>
@@ -90,8 +88,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact139397" target = "projectFrame"><b>constraint</b></a></td><td>artifact</td><td>LocatingPin representing an directive by the user that<br />must not be violated</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130181.html#refclass130181" target = "projectFrame"><b>Constraint</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128261" target = "projectFrame"><b>Controller</b></a></td><td>component</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129029" target = "projectFrame"><b>Controller</b></a></td><td>package</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130693" target = "projectFrame"><b>controller</b></a></td><td>package</td><td>sourcecode package<br /><br />The Processing and Render Controller,<br />located within the MObject Subsystem</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129029" target = "projectFrame"><b>Controller</b></a></td><td>package</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128645" target = "projectFrame"><b>Controller Entities</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128389" target = "projectFrame"><b>Controller Workings</b></a></td><td>class view</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130309.html#refclass130309" target = "projectFrame"><b>ControllerFacade</b></a></td><td>class</td><td>Provides unified access to the Proc-Subsystem Controller. Especially, this Facade class provides the functions to get a render engine to carry out actual renderings.</td></tr>
diff --git a/doc/devel/uml/index_69.html b/doc/devel/uml/index_69.html
index 6ba353281..1f6fd3f19 100644
--- a/doc/devel/uml/index_69.html
+++ b/doc/devel/uml/index_69.html
@@ -24,8 +24,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refobject diagram128901" target = "projectFrame"><b>EDL Example2</b></a></td><td>object diagram</td><td>More complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128005" target = "projectFrame"><b>edls</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class137733.html#refclass137733" target = "projectFrame"><b>Effect</b></a></td><td>class</td><td>Effect or media processing component</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129541" target = "projectFrame"><b>effect</b></a></td><td>artifact</td><td>EDL representation of a pluggable and automatable effect.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact137221" target = "projectFrame"><b>effect</b></a></td><td>artifact</td><td>Effect or media processing component</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129541" target = "projectFrame"><b>effect</b></a></td><td>artifact</td><td>EDL representation of a pluggable and automatable effect.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129029.html#refclass129029" target = "projectFrame"><b>Effect</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation138885" target = "projectFrame"><b>elements</b></a></td><td>relation</td><td>relevant MObjects comprising this segment. TODO: actually necessary??</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation132997" target = "projectFrame"><b>enable</b></a></td><td>operation</td><td>change the enabled status of this asset. Note the corresponding #isActive predicate may depend on the enablement status of parent assets as well</td></tr>
@@ -39,9 +39,9 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130821" target = "projectFrame"><b>error</b></a></td><td>package</td><td>Namespace for Exception Kinds</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128773" target = "projectFrame"><b>error</b></a></td><td>class view</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135557.html#refclass135557" target = "projectFrame"><b>Error</b></a></td><td>class</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact135813" target = "projectFrame"><b>error</b></a></td><td>artifact</td><td>Cinelerra Exception Interface</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact135813" target = "projectFrame"><b>error</b></a></td><td>artifact</td><td>Lumiera Exception Interface</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refexpansion region128133" target = "projectFrame"><b>establish partitioning</b></a></td><td>expansion region</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refdeployment view128133" target = "projectFrame"><b>EXE Deployment</b></a></td><td>deployment view</td><td>defines and lists how the Cinelerra executable has to be created</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refdeployment view128133" target = "projectFrame"><b>EXE Deployment</b></a></td><td>deployment view</td><td>defines and lists how the Lumiera executable has to be created</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class131589.html#refclass131589" target = "projectFrame"><b>ExitNode</b></a></td><td>class</td><td>The output of the render pipeline. Pulling from such exit nodes actually ivokes the render process</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact132229" target = "projectFrame"><b>exitnode</b></a></td><td>artifact</td><td>special Processing Node providing "pullable" output</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129157" target = "projectFrame"><b>explicitplacement</b></a></td><td>artifact</td><td>special Placement yielding an absolute location (Time,Track)-location for a MObject</td></tr>
diff --git a/doc/devel/uml/index_70.html b/doc/devel/uml/index_70.html
index 23907ab84..b36d60aff 100644
--- a/doc/devel/uml/index_70.html
+++ b/doc/devel/uml/index_70.html
@@ -33,8 +33,8 @@
 <tr bgcolor=#f0f0f0><td><a href="class129285.html#refclass129285" target = "projectFrame"><b>FixedLocation</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity object128005" target = "projectFrame"><b>Fixture</b></a></td><td>activity object</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact128773" target = "projectFrame"><b>fixture</b></a></td><td>artifact</td><td>the (low level) representation of the EDL with concrete placement data</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128517" target = "projectFrame"><b>Fixture</b></a></td><td>component</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128261.html#refclass128261" target = "projectFrame"><b>Fixture</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128517" target = "projectFrame"><b>Fixture</b></a></td><td>component</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reffork activity node129029" target = "projectFrame"><b>fork activity node</b></a></td><td>fork activity node</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128821.html#refclass128821" target = "projectFrame"><b>Frame</b></a></td><td>class</td><td>Frames are just a low level lump of continous memory, most parts are opaque. Frames are memory sensitive, they will be small constant sized structures which can be efficently managed in a pool.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refnode128645" target = "projectFrame"><b>Frame</b></a></td><td>node</td><td></td></tr>
diff --git a/doc/devel/uml/index_71.html b/doc/devel/uml/index_71.html
index 23b81058d..82430e314 100644
--- a/doc/devel/uml/index_71.html
+++ b/doc/devel/uml/index_71.html
@@ -51,8 +51,8 @@
 <tr bgcolor=#f0f0f0><td><a href="class133125.html#refclass133125" target = "projectFrame"><b>GLRender</b></a></td><td>class</td><td>Representation of a OpenGL accelerated Video render process</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact133637" target = "projectFrame"><b>glrender</b></a></td><td>artifact</td><td>Representation of a OpenGL accellerated Video render process</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute131077" target = "projectFrame"><b>groups</b></a></td><td>attribute</td><td>additional classification, selections or departments this asset belongs to. Groups are optional, non-exclusive and may be overlapping.</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128773" target = "projectFrame"><b>GUI</b></a></td><td>package</td><td>GUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129797" target = "projectFrame"><b>gui</b></a></td><td>package</td><td>sourcecode package<br /><br />User Interface classes go here</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128773" target = "projectFrame"><b>GUI</b></a></td><td>package</td><td>GUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft</td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/index_72.html b/doc/devel/uml/index_72.html
index a26e1439f..bf8262c8c 100644
--- a/doc/devel/uml/index_72.html
+++ b/doc/devel/uml/index_72.html
@@ -20,7 +20,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128225" target = "projectFrame"><b>handle</b></a></td><td>relation</td><td>weak pointer</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128737" target = "projectFrame"><b>handles</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute128225" target = "projectFrame"><b>handles_available</b></a></td><td>attribute</td><td>initialized to the maximum number of filehandles the backend may use for mapped files. When no handles are available, the handle which is last in the handles list is closed and (re-)used.<br />Else this number is decremented for each new filehandle used and incremented for any one explicitly freed.</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram130181" target = "projectFrame"><b>Hierarchy</b></a></td><td>class diagram</td><td>Cinelerra Exception hierarchy</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram130181" target = "projectFrame"><b>Hierarchy</b></a></td><td>class diagram</td><td>Lumiera Exception hierarchy</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation133381" target = "projectFrame"><b>howtoProc</b></a></td><td>operation</td><td>@return descriptor how to build a render pipeline corresponding to this media</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class132101.html#refclass132101" target = "projectFrame"><b>Hub</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact132741" target = "projectFrame"><b>hub</b></a></td><td>artifact</td><td>special ProcNode used to build data distributing connections</td></tr>
diff --git a/doc/devel/uml/index_73.html b/doc/devel/uml/index_73.html
index 93008767f..27e37a604 100644
--- a/doc/devel/uml/index_73.html
+++ b/doc/devel/uml/index_73.html
@@ -20,9 +20,9 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130437" target = "projectFrame"><b>id</b></a></td><td>attribute</td><td>Asset primary key.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128309" target = "projectFrame"><b>In Memory Database</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity action pin128133" target = "projectFrame"><b>inFixture</b></a></td><td>activity action pin</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131461" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132869" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134149" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132869" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131461" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation131461" target = "projectFrame"><b>instance</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation143621" target = "projectFrame"><b>instructions</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view129029" target = "projectFrame"><b>Interface</b></a></td><td>class view</td><td></td></tr>
diff --git a/doc/devel/uml/index_76.html b/doc/devel/uml/index_76.html
index 9b41469f0..0b4ef97db 100644
--- a/doc/devel/uml/index_76.html
+++ b/doc/devel/uml/index_76.html
@@ -31,6 +31,8 @@
 <tr bgcolor=#f0f0f0><td><a href="class128650.html#refclass128650" target = "projectFrame"><b>Lock</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135685.html#refclass135685" target = "projectFrame"><b>Logic</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute131333" target = "projectFrame"><b>longDesc</b></a></td><td>attribute</td><td>user visible qualification of the thing, unit or concept represented by this asset. perferably "in one line". To be localized.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact128005" target = "projectFrame"><b>Lumiera</b></a></td><td>artifact</td><td>the main executable to be built</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129" target = "projectFrame"><b>lumiera</b></a></td><td>package</td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/index_77.html b/doc/devel/uml/index_77.html
index 68bbd5cfb..3e0b915cc 100644
--- a/doc/devel/uml/index_77.html
+++ b/doc/devel/uml/index_77.html
@@ -40,7 +40,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128261" target = "projectFrame"><b>MObject</b></a></td><td>package</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128517.html#refclass128517" target = "projectFrame"><b>MObject</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refobject diagram131333" target = "projectFrame"><b>multichannel clip</b></a></td><td>object diagram</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class128394.html#refclass128394" target = "projectFrame"><b>Mutex</b></a></td><td>class</td><td>I provided a reworked Mutex class in my cinelerra2 repository</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class128394.html#refclass128394" target = "projectFrame"><b>Mutex</b></a></td><td>class</td><td>I provided a reworked Mutex class in my Cinelerra2 repository</td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/index_79.html b/doc/devel/uml/index_79.html
index 5446e9730..d1fdc83c0 100644
--- a/doc/devel/uml/index_79.html
+++ b/doc/devel/uml/index_79.html
@@ -18,10 +18,10 @@
 <table>
 <tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute129029" target = "projectFrame"><b>offset</b></a></td><td>attribute</td><td>Offset the actual position by this (time) value relative to the anchor point. TODO: Representation?</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130821" target = "projectFrame"><b>org</b></a></td><td>attribute</td><td>origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core cinelerra-3 codebase is "cin3".</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133125" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134405" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130821" target = "projectFrame"><b>org</b></a></td><td>attribute</td><td>origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core Lumiera codebase is "lumi".</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131333" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134405" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133125" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation147973" target = "projectFrame"><b>outPort</b></a></td><td>relation</td><td>the Port this MObject wants to be conected to</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation132613" target = "projectFrame"><b>output</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent diagram128005" target = "projectFrame"><b>Overview</b></a></td><td>component diagram</td><td>This drawing shows the top level compoents and relations</td></tr>
diff --git a/doc/devel/uml/index_82.html b/doc/devel/uml/index_82.html
index 3a3a83808..a76e8f590 100644
--- a/doc/devel/uml/index_82.html
+++ b/doc/devel/uml/index_82.html
@@ -22,8 +22,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation142085" target = "projectFrame"><b>registry</b></a></td><td>relation</td><td>@internal Table or DB holding all registered asset instances.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129925" target = "projectFrame"><b>relativelocation</b></a></td><td>artifact</td><td>Placement implemnetaion providing various ways of attaching a MObject to another one</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129413.html#refclass129413" target = "projectFrame"><b>RelativeLocation</b></a></td><td>class</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class133893.html#refclass133893" target = "projectFrame"><b>RelType</b></a></td><td>class</td><td>the possible kinds of RelativePlacements</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute128133" target = "projectFrame"><b>relType</b></a></td><td>attribute</td><td>the kind of relation denoted by this Placement</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class133893.html#refclass133893" target = "projectFrame"><b>RelType</b></a></td><td>class</td><td>the possible kinds of RelativePlacements</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation132741" target = "projectFrame"><b>remove</b></a></td><td>operation</td><td>remove the given asset &lt;i&gt;together with all its dependants&lt;/i&gt; from the internal DB</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128389" target = "projectFrame"><b>Render Entities</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity parameter128005" target = "projectFrame"><b>Render Request</b></a></td><td>activity parameter</td><td></td></tr>
diff --git a/doc/devel/uml/index_83.html b/doc/devel/uml/index_83.html
index df33c880e..18c49405b 100644
--- a/doc/devel/uml/index_83.html
+++ b/doc/devel/uml/index_83.html
@@ -46,8 +46,8 @@
 <tr bgcolor=#f0f0f0><td><a href="class138885.html#refclass138885" target = "projectFrame"><b>SimpleClip</b></a></td><td>class</td><td>Elementary clip consisting of only one media stream</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128906.html#refclass128906" target = "projectFrame"><b>SmartPointer</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128266" target = "projectFrame"><b>SmartPointers</b></a></td><td>class view</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refrelation141957" target = "projectFrame"><b>source</b></a></td><td>relation</td><td>media source of this clip</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation142469" target = "projectFrame"><b>source</b></a></td><td>relation</td><td>the media source this clip referes to</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refrelation141957" target = "projectFrame"><b>source</b></a></td><td>relation</td><td>media source of this clip</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class133765.html#refclass133765" target = "projectFrame"><b>Source</b></a></td><td>class</td><td>Source Node: represents a media source to pull data from.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact134277" target = "projectFrame"><b>source</b></a></td><td>artifact</td><td>Representation of a Media source</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refdeployment diagram129797" target = "projectFrame"><b>Source Overview</b></a></td><td>deployment diagram</td><td></td></tr>
diff --git a/doc/devel/uml/index_84.html b/doc/devel/uml/index_84.html
index 738749c2a..692cb2cac 100644
--- a/doc/devel/uml/index_84.html
+++ b/doc/devel/uml/index_84.html
@@ -21,7 +21,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130181" target = "projectFrame"><b>theApp_</b></a></td><td>attribute</td><td>holds the single instance and triggers initialization</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128261" target = "projectFrame"><b>theFixture</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation131717" target = "projectFrame"><b>theTimeline</b></a></td><td>relation</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class128138.html#refclass128138" target = "projectFrame"><b>Thread</b></a></td><td>class</td><td>We can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads </td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class128138.html#refclass128138" target = "projectFrame"><b>Thread</b></a></td><td>class</td><td>We can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads </td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute128261" target = "projectFrame"><b>time</b></a></td><td>attribute</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact134789" target = "projectFrame"><b>time</b></a></td><td>artifact</td><td>unified representation of a time point, including conversion functions</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134917.html#refclass134917" target = "projectFrame"><b>Time</b></a></td><td>class</td><td>denotes a temporal position (time point), based on timeline start.<br /><br />investigate posix.4 realtime timers, wrap these here</td></tr>
@@ -43,12 +43,12 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134405" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation129797" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td>This operation is to be overloaded for the specific MObject subclasses to be treated.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130309" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130693" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130565" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130437" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130693" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130053" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation129925" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130181" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation129925" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/index_86.html b/doc/devel/uml/index_86.html
index 2429dd829..f75b93690 100644
--- a/doc/devel/uml/index_86.html
+++ b/doc/devel/uml/index_86.html
@@ -20,23 +20,23 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130949" target = "projectFrame"><b>version</b></a></td><td>attribute</td><td>version number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class133509.html#refclass133509" target = "projectFrame"><b>VFrame</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact134021" target = "projectFrame"><b>vframe</b></a></td><td>artifact</td><td>a buffer and render process holding a Video frame</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133381" target = "projectFrame"><b>vid1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131973" target = "projectFrame"><b>vid1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129925" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133381" target = "projectFrame"><b>vid1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131717" target = "projectFrame"><b>vid_a</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129413" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134021" target = "projectFrame"><b>vid_a</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129413" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129925" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128645" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131077" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134533" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131077" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133765" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132741" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130949" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134277" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128517" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133637" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129157" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134277" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132997" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128517" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130949" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133637" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class140165.html#refclass140165" target = "projectFrame"><b>Visitable</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130949" target = "projectFrame"><b>visitor</b></a></td><td>package</td><td>sub-namespace for visitor library implementation</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact139141" target = "projectFrame"><b>visitor</b></a></td><td>artifact</td><td>Acyclic Visitor library</td></tr>
diff --git a/doc/devel/uml/navig.html b/doc/devel/uml/navig.html
index facf4a06c..74b812388 100644
--- a/doc/devel/uml/navig.html
+++ b/doc/devel/uml/navig.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>/mnt/Lager/heim/devel/cin3/doc/devel/uml/navig</title>
+<title>/mnt/Lager/heim/devel/lumi/doc/devel/uml/navig</title>
 <link rel="stylesheet" href="style.css" type="text/css" />
 </head>
 <body bgcolor="#ffffff">
diff --git a/doc/devel/uml/packages.html b/doc/devel/uml/packages.html
index aac0bc389..c9321815b 100644
--- a/doc/devel/uml/packages.html
+++ b/doc/devel/uml/packages.html
@@ -22,18 +22,18 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129157" target = "projectFrame"><b>BackendLayer</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130565" target = "projectFrame"><b>builder</b></a></td><td>src</td><td>sourcecode package<br /><br />The Builder creating the Render Engine,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128901" target = "projectFrame"><b>Builder</b></a></td><td></td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129" target = "projectFrame"><b>cinelerra3</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128645" target = "projectFrame"><b>codegen</b></a></td><td></td><td>This package is used to organize code generation by BOUML. It is considered useless after having generated the initial code skeleton.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129413" target = "projectFrame"><b>common</b></a></td><td>src</td><td>sourcecode package<br /><br />Common library and helper classes</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128517" target = "projectFrame"><b>CommonLib</b></a></td><td></td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130693" target = "projectFrame"><b>controller</b></a></td><td>src</td><td>sourcecode package<br /><br />The Processing and Render Controller,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129029" target = "projectFrame"><b>Controller</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130693" target = "projectFrame"><b>controller</b></a></td><td>src</td><td>sourcecode package<br /><br />The Processing and Render Controller,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128138" target = "projectFrame"><b>design</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128005" target = "projectFrame"><b>design</b></a></td><td></td><td>All things concering the big picture.<br />Not a real code package, rather a container for design drafts, specifications, decisions.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130309" target = "projectFrame"><b>engine</b></a></td><td>src</td><td>sourcecode package<br /><br />The Core Render Engine</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130821" target = "projectFrame"><b>error</b></a></td><td></td><td>Namespace for Exception Kinds</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128773" target = "projectFrame"><b>GUI</b></a></td><td></td><td>GUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129797" target = "projectFrame"><b>gui</b></a></td><td>src</td><td>sourcecode package<br /><br />User Interface classes go here</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128773" target = "projectFrame"><b>GUI</b></a></td><td></td><td>GUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129" target = "projectFrame"><b>lumiera</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130181" target = "projectFrame"><b>mobject</b></a></td><td>src</td><td>sourcecode package<br /><br />MObject Subsystem<br />including the Session (EDL), Builder and Processing Controller</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128261" target = "projectFrame"><b>MObject</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129669" target = "projectFrame"><b>proc</b></a></td><td>src</td><td>sourcecode package<br /><br />All classes belonging to the (middle) processing layer</td></tr>
diff --git a/doc/devel/uml/public_properties.html b/doc/devel/uml/public_properties.html
index 2cf2100de..6fa20439e 100644
--- a/doc/devel/uml/public_properties.html
+++ b/doc/devel/uml/public_properties.html
@@ -22,7 +22,7 @@
 <tr bgcolor=#f0f0f0><td><a href="class136453.html#refattribute130437"><b>id</b></a></td><td><a href="class136453.html#refclass136453"><b>Asset</b></a></td><td>Asset primary key.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136453.html#refattribute130565"><b>name</b></a></td><td><a href="class136453.html#refclass136453"><b>Asset</b></a></td><td>element ID, comprehensible but sanitized. The tuple (category, name, org) is unique.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139141.html#refrelation144133"><b>nodes</b></a></td><td><a href="class139141.html#refclass139141"><b>DoAttach</b></a></td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class136453.html#refattribute130821"><b>org</b></a></td><td><a href="class136453.html#refclass136453"><b>Asset</b></a></td><td>origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core cinelerra-3 codebase is "cin3".</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class136453.html#refattribute130821"><b>org</b></a></td><td><a href="class136453.html#refclass136453"><b>Asset</b></a></td><td>origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core Lumiera codebase is "lumi".</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139141.html#refattribute131461"><b>point</b></a></td><td><a href="class139141.html#refclass139141"><b>DoAttach</b></a></td><td>identifying the point where the nodes should be attached</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128389.html#refrelation147205"><b>subTracks</b></a></td><td><a href="class128389.html#refclass128389"><b>Track</b></a></td><td>Child tracks in a tree structure</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136453.html#refattribute130949"><b>version</b></a></td><td><a href="class136453.html#refclass136453"><b>Asset</b></a></td><td>version number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions.</td></tr>
diff --git a/src/backend/mediaaccessfacade.cpp b/src/backend/mediaaccessfacade.cpp
index f6a1b8305..bd12068f9 100644
--- a/src/backend/mediaaccessfacade.cpp
+++ b/src/backend/mediaaccessfacade.cpp
@@ -1,8 +1,8 @@
 /*
   MediaAccessFacade  -  functions for querying media file and channels.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/backend/mediaaccessfacade.hpp b/src/backend/mediaaccessfacade.hpp
index d4c0e3a0d..15579d491 100644
--- a/src/backend/mediaaccessfacade.hpp
+++ b/src/backend/mediaaccessfacade.hpp
@@ -1,8 +1,8 @@
 /*
   MEDIAACCESSFACADE.hpp  -  functions for querying media file and channels.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/cinelerra.h b/src/cinelerra.h
index c2b95dd8c..30264a904 100644
--- a/src/cinelerra.h
+++ b/src/cinelerra.h
@@ -2,8 +2,8 @@
   CINELERRA.h  -  global definitions and common types
  
  
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
diff --git a/src/common/appconfig.cpp b/src/common/appconfig.cpp
index d9475bc97..aba876966 100644
--- a/src/common/appconfig.cpp
+++ b/src/common/appconfig.cpp
@@ -1,8 +1,8 @@
 /*
   Appconfig  -  for global initialization and configuration 
  
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/appconfig.hpp b/src/common/appconfig.hpp
index a3b0e3191..bbd50df6f 100644
--- a/src/common/appconfig.hpp
+++ b/src/common/appconfig.hpp
@@ -1,8 +1,8 @@
 /*
   APPCONFIG.hpp  -  for global initialization and configuration 
  
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index ef23743ca..bf00cf2b2 100644
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -1,8 +1,8 @@
 /*
   Cmdline  -  abstraction of the usual commandline, a sequence of strings 
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/cmdline.hpp b/src/common/cmdline.hpp
index d2ea9e72b..8d7b1e44f 100644
--- a/src/common/cmdline.hpp
+++ b/src/common/cmdline.hpp
@@ -1,8 +1,8 @@
 /*
   CMDLINE.hpp  -  abstraction of the usual commandline, a sequence of strings 
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/error.cpp b/src/common/error.cpp
index 94f7ca3ed..17e18e676 100644
--- a/src/common/error.cpp
+++ b/src/common/error.cpp
@@ -1,8 +1,8 @@
 /*
   Error  -  Cinelerra Exception Interface
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/error.hpp b/src/common/error.hpp
index 3251752df..15e60f022 100644
--- a/src/common/error.hpp
+++ b/src/common/error.hpp
@@ -1,8 +1,8 @@
 /*
   ERROR.hpp  -  Cinelerra Exception Interface
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/factory.hpp b/src/common/factory.hpp
index 8c96fd14c..a4b953b3a 100644
--- a/src/common/factory.hpp
+++ b/src/common/factory.hpp
@@ -1,8 +1,8 @@
 /*
   FACTORY.hpp  -  template for object/smart-pointer factories
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/multithread.hpp b/src/common/multithread.hpp
index 0dc79e7c2..cc6eca1c6 100644
--- a/src/common/multithread.hpp
+++ b/src/common/multithread.hpp
@@ -1,8 +1,8 @@
 /*
   MULTITHREAD.hpp  -  generic interface for multithreading primitives
  
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
diff --git a/src/common/singleton.hpp b/src/common/singleton.hpp
index 677b454d3..9f149214f 100644
--- a/src/common/singleton.hpp
+++ b/src/common/singleton.hpp
@@ -1,8 +1,8 @@
 /*
   SINGLETON.hpp  -  configuration header for singleton factory
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/singletonfactory.hpp b/src/common/singletonfactory.hpp
index ba2151584..319722fcf 100644
--- a/src/common/singletonfactory.hpp
+++ b/src/common/singletonfactory.hpp
@@ -1,8 +1,8 @@
 /*
   SINGLETONFACTORY.hpp  -  template for implementing the singleton pattern
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/singletonpolicies.hpp b/src/common/singletonpolicies.hpp
index 7e6f90acf..5ae31b939 100644
--- a/src/common/singletonpolicies.hpp
+++ b/src/common/singletonpolicies.hpp
@@ -1,8 +1,8 @@
 /*
   SINGLETONPOLICIES.hpp  -  how to manage creation, lifecycle and multithreading
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/singletonpreconfigure.hpp b/src/common/singletonpreconfigure.hpp
index c7f08ae6a..9f3cfb8b2 100644
--- a/src/common/singletonpreconfigure.hpp
+++ b/src/common/singletonpreconfigure.hpp
@@ -1,8 +1,8 @@
 /*
   SINGLETONPRECONFIGURE  -  declare the configuration of some Singleton types in advance
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/test/mockinjector.hpp b/src/common/test/mockinjector.hpp
index 8e567fe5d..28258e91e 100644
--- a/src/common/test/mockinjector.hpp
+++ b/src/common/test/mockinjector.hpp
@@ -1,8 +1,8 @@
 /*
   MOCKINJECTOR.hpp  -  replacement singleton factory for injecting Test-Mock objects
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/test/run.hpp b/src/common/test/run.hpp
index 0cee56674..b38729d8a 100644
--- a/src/common/test/run.hpp
+++ b/src/common/test/run.hpp
@@ -1,8 +1,8 @@
 /*
   RUN.hpp  -  helper class for grouping, registering and invoking testcases
  
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
diff --git a/src/common/test/suite.cpp b/src/common/test/suite.cpp
index cca65903f..c81c88097 100644
--- a/src/common/test/suite.cpp
+++ b/src/common/test/suite.cpp
@@ -1,8 +1,8 @@
 /*
   Suite  -  helper class for running collections of tests
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/test/suite.hpp b/src/common/test/suite.hpp
index 4e525a7cd..afdb9e3d6 100644
--- a/src/common/test/suite.hpp
+++ b/src/common/test/suite.hpp
@@ -1,8 +1,8 @@
 /*
   SUITE.hpp  -  helper class for running collections of tests
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/test/testoption.cpp b/src/common/test/testoption.cpp
index 3e40a063c..aaaff32b8 100644
--- a/src/common/test/testoption.cpp
+++ b/src/common/test/testoption.cpp
@@ -1,8 +1,8 @@
 /*
   Suite  -  helper class for running collections of tests
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/test/testoption.hpp b/src/common/test/testoption.hpp
index 8b1a012d3..28a82ff55 100644
--- a/src/common/test/testoption.hpp
+++ b/src/common/test/testoption.hpp
@@ -1,8 +1,8 @@
 /*
   TESTOPTION.hpp  -  handle cmdline for invoking Testsuite
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/time.cpp b/src/common/time.cpp
index 12798a58d..c208fcb46 100644
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -1,8 +1,8 @@
 /*
   Time  -  unified representation of a time point, including conversion functions
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/time.hpp b/src/common/time.hpp
index c0d832098..c4fc22244 100644
--- a/src/common/time.hpp
+++ b/src/common/time.hpp
@@ -1,8 +1,8 @@
 /*
   TIME.hpp  -  unified representation of a time point, including conversion functions
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/typelist.hpp b/src/common/typelist.hpp
index 11bfd355c..6d2720fcb 100644
--- a/src/common/typelist.hpp
+++ b/src/common/typelist.hpp
@@ -1,8 +1,8 @@
 /*
   TYPELIST.hpp  -  typelist meta programming facilities
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/util.cpp b/src/common/util.cpp
index f80b5d2b6..32e5bc84f 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -1,8 +1,8 @@
 /*
   util.cpp  -  helper functions implementation
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/util.hpp b/src/common/util.hpp
index 101a3ccaf..4687bd7f4 100644
--- a/src/common/util.hpp
+++ b/src/common/util.hpp
@@ -1,8 +1,8 @@
 /*
   UTIL.hpp  -  collection of small helper functions used "everywhere"
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/visitor.cpp b/src/common/visitor.cpp
index 4903b6d5d..f702f809b 100644
--- a/src/common/visitor.cpp
+++ b/src/common/visitor.cpp
@@ -1,8 +1,8 @@
 /*
   Vistitable,Tool,Applicable  -  Acyclic Visitor library
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/visitor.hpp b/src/common/visitor.hpp
index ed37c1963..251254a88 100644
--- a/src/common/visitor.hpp
+++ b/src/common/visitor.hpp
@@ -1,8 +1,8 @@
 /*
   VISITOR.hpp  -  Generic Visitor library implementation
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/visitordispatcher.hpp b/src/common/visitordispatcher.hpp
index 50d726761..0be12b2df 100644
--- a/src/common/visitordispatcher.hpp
+++ b/src/common/visitordispatcher.hpp
@@ -1,8 +1,8 @@
 /*
   VISITORDISPATCHER.hpp  -  visitor implementation details
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/common/visitorpolicies.hpp b/src/common/visitorpolicies.hpp
index 2fd0cb37f..6b9f353a5 100644
--- a/src/common/visitorpolicies.hpp
+++ b/src/common/visitorpolicies.hpp
@@ -1,8 +1,8 @@
 /*
   VISITOR.hpp  -  Acyclic Visitor library
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f0b6b2792..396e8ff81 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C)         CinelerraCV
+#  Copyright (C)         Lumiera.org
 #    2007,               Christian Thaeter <ct@pipapo.org>
 #
 #  This program is free software; you can redistribute it and/or
diff --git a/src/lib/condition.c b/src/lib/condition.c
index dfc79c7c5..2b0bc28e8 100644
--- a/src/lib/condition.c
+++ b/src/lib/condition.c
@@ -1,8 +1,8 @@
 /*
   condition.c  -  condition variable
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/condition.h b/src/lib/condition.h
index 7925fd993..73da3685f 100644
--- a/src/lib/condition.h
+++ b/src/lib/condition.h
@@ -1,8 +1,8 @@
 /*
   condition.h  -  condition variables
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/error.c b/src/lib/error.c
index d5ea88f01..df881013b 100644
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -1,8 +1,8 @@
 /*
   error.c  -  Cinelerra Error handling
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/error.h b/src/lib/error.h
index 2b5051652..322487de1 100644
--- a/src/lib/error.h
+++ b/src/lib/error.h
@@ -1,8 +1,8 @@
 /*
   error.h  -  Cinelerra Error handling
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/framerate.c b/src/lib/framerate.c
index b70121a37..717bab4bb 100644
--- a/src/lib/framerate.c
+++ b/src/lib/framerate.c
@@ -1,8 +1,8 @@
 /*
   framerate.c  -  framerate calculations
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/framerate.h b/src/lib/framerate.h
index 1e862ed0d..c7c9d2adc 100644
--- a/src/lib/framerate.h
+++ b/src/lib/framerate.h
@@ -1,8 +1,8 @@
 /*
   framerate.h  -  framerate calculations
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/llist.h b/src/lib/llist.h
index 032210a35..4f77b20dc 100644
--- a/src/lib/llist.h
+++ b/src/lib/llist.h
@@ -3,8 +3,8 @@
 
   Copyright (C)
     2003, 2005          Christian Thaeter <chth@gmx.net>
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/locking.h b/src/lib/locking.h
index 6e53fee97..2cf7f3700 100644
--- a/src/lib/locking.h
+++ b/src/lib/locking.h
@@ -1,8 +1,8 @@
 /*
   locking.h  -  shared declarations for all locking primitives
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/mutex.c b/src/lib/mutex.c
index 1425fdd02..b644c00ca 100644
--- a/src/lib/mutex.c
+++ b/src/lib/mutex.c
@@ -1,8 +1,8 @@
 /*
   mutex.c  -  mutex
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/mutex.h b/src/lib/mutex.h
index a359d9b75..4dc4bac92 100644
--- a/src/lib/mutex.h
+++ b/src/lib/mutex.h
@@ -1,8 +1,8 @@
 /*
   mutex.h  -  mutal exclusion locking
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/plugin.c b/src/lib/plugin.c
index 184b0cb06..f819f4a6a 100644
--- a/src/lib/plugin.c
+++ b/src/lib/plugin.c
@@ -1,8 +1,8 @@
 /*
   plugin.c  -  Cinelerra Plugin loader
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/plugin.h b/src/lib/plugin.h
index a31e69199..45a22bf29 100644
--- a/src/lib/plugin.h
+++ b/src/lib/plugin.h
@@ -1,8 +1,8 @@
 /*
   plugin.h  -  Plugin loader
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/references.c b/src/lib/references.c
index 6dfdcf011..a4c5eb247 100644
--- a/src/lib/references.c
+++ b/src/lib/references.c
@@ -1,8 +1,8 @@
 /*
   references.c  -  strong and weak references
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/references.h b/src/lib/references.h
index 5f5543787..a7de3f7f0 100644
--- a/src/lib/references.h
+++ b/src/lib/references.h
@@ -1,8 +1,8 @@
 /*
   references.h  -  strong and weak references
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/rwlock.c b/src/lib/rwlock.c
index 48becb14d..d60223e3c 100644
--- a/src/lib/rwlock.c
+++ b/src/lib/rwlock.c
@@ -1,8 +1,8 @@
 /*
   rwlock.c  -  read/write locks
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/rwlock.h b/src/lib/rwlock.h
index 21ad1e054..266887e24 100644
--- a/src/lib/rwlock.h
+++ b/src/lib/rwlock.h
@@ -1,8 +1,8 @@
 /*
   rwlock.h  -  read/write locks
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/time.c b/src/lib/time.c
index 6cbdde6ee..4566e44b5 100644
--- a/src/lib/time.c
+++ b/src/lib/time.c
@@ -1,8 +1,8 @@
 /*
   time.h  -  Time and frame calculations
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/lib/time.h b/src/lib/time.h
index 4203ece49..d4c05b71c 100644
--- a/src/lib/time.h
+++ b/src/lib/time.h
@@ -1,8 +1,8 @@
 /*
   time.h  -  Time calculations
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/main.cpp b/src/main.cpp
index 03ae44b61..8d564ed87 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,8 @@
 /*
-  main.cpp  -  start the Cinelerra Application
+  main.cpp  -  start the Lumiera Application
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
 
   This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@ using cinelerra::Appconfig;
 
 int main (int argc, char* argv[])
 {
-  cout << "*** Cinelerra NLE for Linux ***" << endl
+  cout << "*** Lumiera NLE for Linux ***" << endl
        << "    Version: " << Appconfig::get("version") << endl;
   return 0;
 }
diff --git a/src/nobugcfg.h b/src/nobugcfg.h
index 7907d50a1..2cd719a87 100644
--- a/src/nobugcfg.h
+++ b/src/nobugcfg.h
@@ -2,8 +2,8 @@
   NOBUGCFG.h  -  global configuration and definitions for NoBug
  
  
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
diff --git a/src/pre.hpp b/src/pre.hpp
index af83dd9a2..8c504c368 100644
--- a/src/pre.hpp
+++ b/src/pre.hpp
@@ -2,8 +2,8 @@
   PRE.hpp  -  precompiled header collection
  
  
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp
index 5878936f0..d97c2fd9e 100644
--- a/src/proc/asset.cpp
+++ b/src/proc/asset.cpp
@@ -1,8 +1,8 @@
 /*
   Asset}  -  Superinterface: bookeeping view of "things" present in the session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp
index 2e6a1cd6c..cec77bec4 100644
--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@@ -1,8 +1,8 @@
 /*
   ASSET.hpp  -  Superinterface: bookeeping view of "things" present in the session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -116,7 +116,7 @@ namespace asset
   
   /**
    * Superinterface describing especially bookeeping properties.
-   * As of 09/2007, there are four  <b>Kinds</b> of Assets, each
+   * As of 09/2008, there are four  <b>Kinds</b> of Assets, each
    * comprising a sub-Interface of the Asset Interface:
    * <ul><li>asset::Media representing mediafiles</li>
    *     <li>asset::Proc representing media data processing components (e.g. Effects)</li>
diff --git a/src/proc/asset/buildinstruct.cpp b/src/proc/asset/buildinstruct.cpp
index de19c647e..8a3e1f214 100644
--- a/src/proc/asset/buildinstruct.cpp
+++ b/src/proc/asset/buildinstruct.cpp
@@ -1,8 +1,8 @@
 /*
   BuildInstruct  -  Instructions for building some configuration of render nodes.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/buildinstruct.hpp b/src/proc/asset/buildinstruct.hpp
index 0a0062e25..fc49b3a30 100644
--- a/src/proc/asset/buildinstruct.hpp
+++ b/src/proc/asset/buildinstruct.hpp
@@ -1,8 +1,8 @@
 /*
   BUILDINSTRUCT.hpp  -  Instructions for building some configuration of render nodes.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/category.cpp b/src/proc/asset/category.cpp
index 41f6e1c03..490f1f0d6 100644
--- a/src/proc/asset/category.cpp
+++ b/src/proc/asset/category.cpp
@@ -1,8 +1,8 @@
 /*
   Category  -  tree like classification of Assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/category.hpp b/src/proc/asset/category.hpp
index b70f34943..9e0526cc2 100644
--- a/src/proc/asset/category.hpp
+++ b/src/proc/asset/category.hpp
@@ -1,8 +1,8 @@
 /*
   CATEGORY.hpp  -  tree like classification of Assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/clip.cpp b/src/proc/asset/clip.cpp
index 38e78e59a..7b42cb16d 100644
--- a/src/proc/asset/clip.cpp
+++ b/src/proc/asset/clip.cpp
@@ -1,8 +1,8 @@
 /*
   Clip(Asset)  -  bookkeeping (asset) view of a media clip.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/clip.hpp b/src/proc/asset/clip.hpp
index 47f6e2860..f5e1ea629 100644
--- a/src/proc/asset/clip.hpp
+++ b/src/proc/asset/clip.hpp
@@ -1,8 +1,8 @@
 /*
   CLIP.hpp  -  bookkeeping (asset) view of a media clip.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/codec.cpp b/src/proc/asset/codec.cpp
index ecfcb0313..8604a89d6 100644
--- a/src/proc/asset/codec.cpp
+++ b/src/proc/asset/codec.cpp
@@ -1,8 +1,8 @@
 /*
   Codec(Asset)  -  description of some media data decoder or encoder facility
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/codec.hpp b/src/proc/asset/codec.hpp
index 890eaa422..40ee70370 100644
--- a/src/proc/asset/codec.hpp
+++ b/src/proc/asset/codec.hpp
@@ -1,8 +1,8 @@
 /*
   CODEC.hpp  -  description of some media data decoder or encoder facility
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/compoundmedia.cpp b/src/proc/asset/compoundmedia.cpp
index 8b53c97e8..1a00458b6 100644
--- a/src/proc/asset/compoundmedia.cpp
+++ b/src/proc/asset/compoundmedia.cpp
@@ -1,8 +1,8 @@
 /*
   CompoundMedia  -  multichannel media
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/compoundmedia.hpp b/src/proc/asset/compoundmedia.hpp
index 0e7b0bd97..534993391 100644
--- a/src/proc/asset/compoundmedia.hpp
+++ b/src/proc/asset/compoundmedia.hpp
@@ -1,8 +1,8 @@
 /*
   COMPOUNDMEDIA.hpp  -  multichannel media
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/dataset.cpp b/src/proc/asset/dataset.cpp
index 7b1ddf997..f82460fed 100644
--- a/src/proc/asset/dataset.cpp
+++ b/src/proc/asset/dataset.cpp
@@ -1,8 +1,8 @@
 /*
   Dataset  -  meta asset describing a collection of control data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/dataset.hpp b/src/proc/asset/dataset.hpp
index 8ce580cbe..31fcb8982 100644
--- a/src/proc/asset/dataset.hpp
+++ b/src/proc/asset/dataset.hpp
@@ -1,8 +1,8 @@
 /*
   DATASET.hpp  -  meta asset describing a collection of control data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp
index 8f228d01b..9f33b01af 100644
--- a/src/proc/asset/db.hpp
+++ b/src/proc/asset/db.hpp
@@ -1,8 +1,8 @@
 /*
   DB.hpp  -  registry holding known Asset instances.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/effect.cpp b/src/proc/asset/effect.cpp
index 7ff288876..e8203996e 100644
--- a/src/proc/asset/effect.cpp
+++ b/src/proc/asset/effect.cpp
@@ -1,8 +1,8 @@
 /*
   Effect(Asset)  -  Effect or media processing component
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/effect.hpp b/src/proc/asset/effect.hpp
index 78c990c98..5d00e44b8 100644
--- a/src/proc/asset/effect.hpp
+++ b/src/proc/asset/effect.hpp
@@ -1,8 +1,8 @@
 /*
   EFFECT.hpp  -  Effect or media processing component
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp
index 0dd34936f..1610e822e 100644
--- a/src/proc/asset/media.cpp
+++ b/src/proc/asset/media.cpp
@@ -1,8 +1,8 @@
 /*
   Media(Asset)  -  key abstraction: media-like assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp
index 9c1a85627..67c6a31ca 100644
--- a/src/proc/asset/media.hpp
+++ b/src/proc/asset/media.hpp
@@ -1,8 +1,8 @@
 /*
   MEDIA.hpp  -  key abstraction: media-like assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/meta.cpp b/src/proc/asset/meta.cpp
index 0395d3ea8..bdfd1c411 100644
--- a/src/proc/asset/meta.cpp
+++ b/src/proc/asset/meta.cpp
@@ -1,8 +1,8 @@
 /*
   Meta(Asset)  -  key abstraction: metadata and organisational asset
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp
index e1b2f48fc..e995f53a3 100644
--- a/src/proc/asset/meta.hpp
+++ b/src/proc/asset/meta.hpp
@@ -1,8 +1,8 @@
 /*
   META.hpp  -  key abstraction: metadata and organisational asset
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/outport.cpp b/src/proc/asset/outport.cpp
index c0a228319..d4c8b82fe 100644
--- a/src/proc/asset/outport.cpp
+++ b/src/proc/asset/outport.cpp
@@ -1,8 +1,8 @@
 /*
   OutPort  -  structural asset corresponding to some port generating media output
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/outport.hpp b/src/proc/asset/outport.hpp
index c0afd059d..ae8e5ff85 100644
--- a/src/proc/asset/outport.hpp
+++ b/src/proc/asset/outport.hpp
@@ -1,8 +1,8 @@
 /*
   OUTPORT.hpp  -  structural asset corresponding to some port generating media output
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/preview.cpp b/src/proc/asset/preview.cpp
index 888681f35..2753f8cc9 100644
--- a/src/proc/asset/preview.cpp
+++ b/src/proc/asset/preview.cpp
@@ -1,8 +1,8 @@
 /*
   Preview(Asset) -  alternative version of the media data, probably with lower resolution
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/preview.hpp b/src/proc/asset/preview.hpp
index 2a8c3c8a3..e36e22ea4 100644
--- a/src/proc/asset/preview.hpp
+++ b/src/proc/asset/preview.hpp
@@ -1,8 +1,8 @@
 /*
   PREVIEW.hpp  -  alternative version of the media data, probably with lower resolution
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/proc.cpp b/src/proc/asset/proc.cpp
index cff302a24..87aa48da6 100644
--- a/src/proc/asset/proc.cpp
+++ b/src/proc/asset/proc.cpp
@@ -1,8 +1,8 @@
 /*
   Proc(Asset)  -  key abstraction: media-like assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp
index fb9d2f494..229f66fcd 100644
--- a/src/proc/asset/proc.hpp
+++ b/src/proc/asset/proc.hpp
@@ -1,8 +1,8 @@
 /*
   PROC.hpp  -  key abstraction: media-like assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/procpatt.cpp b/src/proc/asset/procpatt.cpp
index eebed7fad..79b7d46aa 100644
--- a/src/proc/asset/procpatt.cpp
+++ b/src/proc/asset/procpatt.cpp
@@ -1,8 +1,8 @@
 /*
   ProcPatt  -  template for building some render processing network
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/procpatt.hpp b/src/proc/asset/procpatt.hpp
index 77ea5cd26..2fcaba6ff 100644
--- a/src/proc/asset/procpatt.hpp
+++ b/src/proc/asset/procpatt.hpp
@@ -1,8 +1,8 @@
 /*
   PROCPATT.hpp  -  template for building some render processing network
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp
index 069830c27..4a5fca644 100644
--- a/src/proc/asset/struct.cpp
+++ b/src/proc/asset/struct.cpp
@@ -1,8 +1,8 @@
 /*
   Struct(Asset)  -  key abstraction: structural asset
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp
index 33d329979..24cc5c053 100644
--- a/src/proc/asset/struct.hpp
+++ b/src/proc/asset/struct.hpp
@@ -1,8 +1,8 @@
 /*
   STRUCT.hpp  -  key abstraction: structural asset
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/track.cpp b/src/proc/asset/track.cpp
index d7b9b8feb..fa13b1d63 100644
--- a/src/proc/asset/track.cpp
+++ b/src/proc/asset/track.cpp
@@ -1,8 +1,8 @@
 /*
   Track  -  structural asset holding the configuration of a track in the EDL
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/track.hpp b/src/proc/asset/track.hpp
index 6a7aa04e3..5f83324d1 100644
--- a/src/proc/asset/track.hpp
+++ b/src/proc/asset/track.hpp
@@ -1,8 +1,8 @@
 /*
   TRACK.hpp  -  structural asset holding the configuration of a track in the EDL
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/unknown.cpp b/src/proc/asset/unknown.cpp
index 57da632df..25d91936c 100644
--- a/src/proc/asset/unknown.cpp
+++ b/src/proc/asset/unknown.cpp
@@ -1,8 +1,8 @@
 /*
   Unknown  -  placeholder for unknown or unavailable media source
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/asset/unknown.hpp b/src/proc/asset/unknown.hpp
index 8f11518b4..aa9cd6ec3 100644
--- a/src/proc/asset/unknown.hpp
+++ b/src/proc/asset/unknown.hpp
@@ -1,8 +1,8 @@
 /*
   UNKNOWN.hpp  -  placeholder for unknown or unavailable media source
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp
index 46717c166..bc6f42ecd 100644
--- a/src/proc/assetmanager.cpp
+++ b/src/proc/assetmanager.cpp
@@ -1,8 +1,8 @@
 /*
   AssetManager  -  Facade for the Asset subsystem
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp
index aaf5910dd..d1b20e025 100644
--- a/src/proc/assetmanager.hpp
+++ b/src/proc/assetmanager.hpp
@@ -1,8 +1,8 @@
 /*
   ASSETMANAGER.hpp  -  Facade for the Asset subsystem
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/controllerfacade.cpp b/src/proc/controllerfacade.cpp
index 52ce4889e..cff9e43d0 100644
--- a/src/proc/controllerfacade.cpp
+++ b/src/proc/controllerfacade.cpp
@@ -1,8 +1,8 @@
 /*
   ControllerFacade  -  Facade and service access point for the Proc Layer Controller
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/controllerfacade.hpp b/src/proc/controllerfacade.hpp
index 7fd07a8aa..faa213e9b 100644
--- a/src/proc/controllerfacade.hpp
+++ b/src/proc/controllerfacade.hpp
@@ -1,8 +1,8 @@
 /*
   CONTROLLERFACADE.hpp  -  Facade and service access point for the Proc Layer Controller
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/aframe.cpp b/src/proc/engine/aframe.cpp
index 067feaf5b..e8713897b 100644
--- a/src/proc/engine/aframe.cpp
+++ b/src/proc/engine/aframe.cpp
@@ -1,8 +1,8 @@
 /*
   AFrame  -  buffer holding a Audio samples for the render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/aframe.hpp b/src/proc/engine/aframe.hpp
index 234bce578..0d77e15ca 100644
--- a/src/proc/engine/aframe.hpp
+++ b/src/proc/engine/aframe.hpp
@@ -1,8 +1,8 @@
 /*
   AFRAME.hpp  -  buffer holding a Audio samples for the render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/arender.cpp b/src/proc/engine/arender.cpp
index e9fbc4897..ac7171998 100644
--- a/src/proc/engine/arender.cpp
+++ b/src/proc/engine/arender.cpp
@@ -1,8 +1,8 @@
 /*
   ARender  -  Representation of a Audio Render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/arender.hpp b/src/proc/engine/arender.hpp
index 98c929c7a..79c70c460 100644
--- a/src/proc/engine/arender.hpp
+++ b/src/proc/engine/arender.hpp
@@ -1,8 +1,8 @@
 /*
   ARENDER.hpp  -  Representation of a Audio Render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/codecadapter.cpp b/src/proc/engine/codecadapter.cpp
index 28ce9317e..b65694679 100644
--- a/src/proc/engine/codecadapter.cpp
+++ b/src/proc/engine/codecadapter.cpp
@@ -1,8 +1,8 @@
 /*
   CodecAdapter  -  Processing Node for (de)coding media data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/codecadapter.hpp b/src/proc/engine/codecadapter.hpp
index e6d1eec02..5b4991177 100644
--- a/src/proc/engine/codecadapter.hpp
+++ b/src/proc/engine/codecadapter.hpp
@@ -1,8 +1,8 @@
 /*
   CODECADAPTER.hpp  -  Processing Node for (de)coding media data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/exitnode.cpp b/src/proc/engine/exitnode.cpp
index 7f1539af2..8c26b7cd9 100644
--- a/src/proc/engine/exitnode.cpp
+++ b/src/proc/engine/exitnode.cpp
@@ -1,8 +1,8 @@
 /*
   ExitNode  -  special Processing Node providing "pullable" output
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/exitnode.hpp b/src/proc/engine/exitnode.hpp
index e0b7ffc2e..1cb6e51c2 100644
--- a/src/proc/engine/exitnode.hpp
+++ b/src/proc/engine/exitnode.hpp
@@ -1,8 +1,8 @@
 /*
   EXITNODE.hpp  -  special Processing Node providing "pullable" output
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/glbuf.cpp b/src/proc/engine/glbuf.cpp
index d383174ae..6970a3114 100644
--- a/src/proc/engine/glbuf.cpp
+++ b/src/proc/engine/glbuf.cpp
@@ -1,8 +1,8 @@
 /*
   GLBuf  -  a buffer and render process holding a Video frame for OpenGL rendering
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/glbuf.hpp b/src/proc/engine/glbuf.hpp
index 59735595e..8e8ee2ea5 100644
--- a/src/proc/engine/glbuf.hpp
+++ b/src/proc/engine/glbuf.hpp
@@ -1,8 +1,8 @@
 /*
   GLBUF.hpp  -  a buffer and render process holding a Video frame for OpenGL rendering
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/glpipe.cpp b/src/proc/engine/glpipe.cpp
index 41139b7cd..9d4d28b48 100644
--- a/src/proc/engine/glpipe.cpp
+++ b/src/proc/engine/glpipe.cpp
@@ -1,8 +1,8 @@
 /*
   GLPipe  -  specialized connection element for handling OpenGL implementation details
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/glpipe.hpp b/src/proc/engine/glpipe.hpp
index b0c2c66f0..39a98a7ab 100644
--- a/src/proc/engine/glpipe.hpp
+++ b/src/proc/engine/glpipe.hpp
@@ -1,8 +1,8 @@
 /*
   GLPIPE.hpp  -  specialized connection element for handling OpenGL implementation details
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/glrender.cpp b/src/proc/engine/glrender.cpp
index a15a369e7..32420201b 100644
--- a/src/proc/engine/glrender.cpp
+++ b/src/proc/engine/glrender.cpp
@@ -1,8 +1,8 @@
 /*
   GLRender  -  Representation of a OpenGL accellerated Video render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/glrender.hpp b/src/proc/engine/glrender.hpp
index 99af3fb5a..e9c73c3a3 100644
--- a/src/proc/engine/glrender.hpp
+++ b/src/proc/engine/glrender.hpp
@@ -1,8 +1,8 @@
 /*
   GLRENDER.hpp  -  Representation of a OpenGL accellerated Video render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/hub.cpp b/src/proc/engine/hub.cpp
index 30a4b62fa..394d24197 100644
--- a/src/proc/engine/hub.cpp
+++ b/src/proc/engine/hub.cpp
@@ -1,8 +1,8 @@
 /*
   Hub  -  special ProcNode used to build data distributing connections
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/hub.hpp b/src/proc/engine/hub.hpp
index 161e8bfd8..b6ec69fcb 100644
--- a/src/proc/engine/hub.hpp
+++ b/src/proc/engine/hub.hpp
@@ -1,8 +1,8 @@
 /*
   HUB.hpp  -  special ProcNode used to build data distributing connections
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/link.cpp b/src/proc/engine/link.cpp
index 089ca35c5..aac01ed41 100644
--- a/src/proc/engine/link.cpp
+++ b/src/proc/engine/link.cpp
@@ -1,8 +1,8 @@
 /*
   Link  -  forwarding, adapting or connecting ProcNode
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/link.hpp b/src/proc/engine/link.hpp
index 78accf220..ad2f3a625 100644
--- a/src/proc/engine/link.hpp
+++ b/src/proc/engine/link.hpp
@@ -1,8 +1,8 @@
 /*
   LINK.hpp  -  forwarding, adapting or connecting ProcNode
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/mask.cpp b/src/proc/engine/mask.cpp
index 8f0b61156..beecb86d3 100644
--- a/src/proc/engine/mask.cpp
+++ b/src/proc/engine/mask.cpp
@@ -1,8 +1,8 @@
 /*
   Mask  -  Video ProcNode for masking regions of the image (automatable)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/mask.hpp b/src/proc/engine/mask.hpp
index 2bbcedd14..ccbac5bcf 100644
--- a/src/proc/engine/mask.hpp
+++ b/src/proc/engine/mask.hpp
@@ -1,8 +1,8 @@
 /*
   MASK.hpp  -  Video ProcNode for masking regions of the image (automatable)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/pluginadapter.cpp b/src/proc/engine/pluginadapter.cpp
index 9d9f9c621..fb57ae58a 100644
--- a/src/proc/engine/pluginadapter.cpp
+++ b/src/proc/engine/pluginadapter.cpp
@@ -1,8 +1,8 @@
 /*
   PluginAdapter  -  Adapter for integrating various Effect processors in the render pipeline
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/pluginadapter.hpp b/src/proc/engine/pluginadapter.hpp
index cfbd0ac78..b080b99ed 100644
--- a/src/proc/engine/pluginadapter.hpp
+++ b/src/proc/engine/pluginadapter.hpp
@@ -1,8 +1,8 @@
 /*
   PLUGINADAPTER.hpp  -  Adapter for integrating various Effect processors in the render pipeline
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/processor.cpp b/src/proc/engine/processor.cpp
index 4db2f793e..c8a228845 100644
--- a/src/proc/engine/processor.cpp
+++ b/src/proc/engine/processor.cpp
@@ -1,8 +1,8 @@
 /*
   Processor  -  a single render pipeline for one segment of the timeline
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/processor.hpp b/src/proc/engine/processor.hpp
index 2856fec3d..70ec33f6c 100644
--- a/src/proc/engine/processor.hpp
+++ b/src/proc/engine/processor.hpp
@@ -1,8 +1,8 @@
 /*
   PROCESSOR.hpp  -  a single render pipeline for one segment of the timeline
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/procnode.cpp b/src/proc/engine/procnode.cpp
index 0e7af64ca..48e33c498 100644
--- a/src/proc/engine/procnode.cpp
+++ b/src/proc/engine/procnode.cpp
@@ -1,8 +1,8 @@
 /*
   ProcNode  -  Key abstraction of the Render Engine: a Processing Node
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/procnode.hpp b/src/proc/engine/procnode.hpp
index 9fe4a053d..ae210f96b 100644
--- a/src/proc/engine/procnode.hpp
+++ b/src/proc/engine/procnode.hpp
@@ -1,8 +1,8 @@
 /*
   PROCNODE.hpp  -  Key abstraction of the Render Engine: a Processing Node
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/projector.cpp b/src/proc/engine/projector.cpp
index 38d44631d..14fcecabb 100644
--- a/src/proc/engine/projector.cpp
+++ b/src/proc/engine/projector.cpp
@@ -1,8 +1,8 @@
 /*
   Projector  -  video ProcNode for scaling and translating image data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/projector.hpp b/src/proc/engine/projector.hpp
index fa60a30d8..0908eec38 100644
--- a/src/proc/engine/projector.hpp
+++ b/src/proc/engine/projector.hpp
@@ -1,8 +1,8 @@
 /*
   PROJECTOR.hpp  -  video ProcNode for scaling and translating image data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/renderengine.cpp b/src/proc/engine/renderengine.cpp
index 23afb432a..daa7084ca 100644
--- a/src/proc/engine/renderengine.cpp
+++ b/src/proc/engine/renderengine.cpp
@@ -1,8 +1,8 @@
 /*
   RenderEngine  -  a complete network of processing nodes usable for rendering
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/renderengine.hpp b/src/proc/engine/renderengine.hpp
index 10a6e80e3..121d0618c 100644
--- a/src/proc/engine/renderengine.hpp
+++ b/src/proc/engine/renderengine.hpp
@@ -1,8 +1,8 @@
 /*
   RENDERENGINE.hpp  -  a complete network of processing nodes usable for rendering
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/source.cpp b/src/proc/engine/source.cpp
index dec53e998..73da9add5 100644
--- a/src/proc/engine/source.cpp
+++ b/src/proc/engine/source.cpp
@@ -1,8 +1,8 @@
 /*
   Source  -  Representation of a Media source
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/source.hpp b/src/proc/engine/source.hpp
index e8a6063cc..37af97841 100644
--- a/src/proc/engine/source.hpp
+++ b/src/proc/engine/source.hpp
@@ -1,8 +1,8 @@
 /*
   SOURCE.hpp  -  Representation of a Media source
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/trafo.cpp b/src/proc/engine/trafo.cpp
index ab96fae91..28c3db772 100644
--- a/src/proc/engine/trafo.cpp
+++ b/src/proc/engine/trafo.cpp
@@ -1,8 +1,8 @@
 /*
   Trafo  -  transforming processing Node 
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/trafo.hpp b/src/proc/engine/trafo.hpp
index 7367415ea..8d2155661 100644
--- a/src/proc/engine/trafo.hpp
+++ b/src/proc/engine/trafo.hpp
@@ -1,8 +1,8 @@
 /*
   TRAFO.hpp  -  transforming processing Node 
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/vframe.cpp b/src/proc/engine/vframe.cpp
index d96b1a07c..180faca70 100644
--- a/src/proc/engine/vframe.cpp
+++ b/src/proc/engine/vframe.cpp
@@ -1,8 +1,8 @@
 /*
   VFrame  -  a buffer holding a Video frame for the render process 
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/vframe.hpp b/src/proc/engine/vframe.hpp
index ebd400dfc..6b1e8153b 100644
--- a/src/proc/engine/vframe.hpp
+++ b/src/proc/engine/vframe.hpp
@@ -1,8 +1,8 @@
 /*
   VFRAME.hpp  -  a buffer holding a Video frame for the render process 
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/vrender.cpp b/src/proc/engine/vrender.cpp
index 5b13999d0..2bed41099 100644
--- a/src/proc/engine/vrender.cpp
+++ b/src/proc/engine/vrender.cpp
@@ -1,8 +1,8 @@
 /*
   VRender  -  Representation of a Video render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/engine/vrender.hpp b/src/proc/engine/vrender.hpp
index f47e40ca9..c6a34bda2 100644
--- a/src/proc/engine/vrender.hpp
+++ b/src/proc/engine/vrender.hpp
@@ -1,8 +1,8 @@
 /*
   VRENDER.hpp  -  Representation of a Video render process
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/frame.cpp b/src/proc/frame.cpp
index 8cc62841a..46ad06950 100644
--- a/src/proc/frame.cpp
+++ b/src/proc/frame.cpp
@@ -1,8 +1,8 @@
 /*
   Frame  -  Key Abstraction: render process and buffer holding frame data.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/frame.hpp b/src/proc/frame.hpp
index 5072ca00b..239987e97 100644
--- a/src/proc/frame.hpp
+++ b/src/proc/frame.hpp
@@ -1,8 +1,8 @@
 /*
   FRAME.hpp  -  Key Abstraction: render process and buffer holding frame data.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/assembler.cpp b/src/proc/mobject/builder/assembler.cpp
index c20850012..8542860f3 100644
--- a/src/proc/mobject/builder/assembler.cpp
+++ b/src/proc/mobject/builder/assembler.cpp
@@ -1,8 +1,8 @@
 /*
   Assembler  -  building facility (implementation of the build process)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/assembler.hpp b/src/proc/mobject/builder/assembler.hpp
index 7f3a70a14..f0274f171 100644
--- a/src/proc/mobject/builder/assembler.hpp
+++ b/src/proc/mobject/builder/assembler.hpp
@@ -1,8 +1,8 @@
 /*
   ASSEMBLER.hpp  -  building facility (implementation of the build process)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/buildertool.hpp b/src/proc/mobject/builder/buildertool.hpp
index 61bb7913c..c4700bc0a 100644
--- a/src/proc/mobject/builder/buildertool.hpp
+++ b/src/proc/mobject/builder/buildertool.hpp
@@ -1,8 +1,8 @@
 /*
   BUILDERTOOL.hpp  -  Interface, (visiting) tool for processing MObjects
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/conmanager.cpp b/src/proc/mobject/builder/conmanager.cpp
index 15b6def9c..e32ecf92b 100644
--- a/src/proc/mobject/builder/conmanager.cpp
+++ b/src/proc/mobject/builder/conmanager.cpp
@@ -1,8 +1,8 @@
 /*
   ConManager  -  manages the creation of additional ProcNode connections for the Renderengine
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/conmanager.hpp b/src/proc/mobject/builder/conmanager.hpp
index d59e53d48..3cd75cc6d 100644
--- a/src/proc/mobject/builder/conmanager.hpp
+++ b/src/proc/mobject/builder/conmanager.hpp
@@ -1,8 +1,8 @@
 /*
   CONMANAGER.hpp  -  manages the creation of additional ProcNode connections for the Renderengine
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/nodecreatertool.cpp b/src/proc/mobject/builder/nodecreatertool.cpp
index d4e0d78dd..89a35fa46 100644
--- a/src/proc/mobject/builder/nodecreatertool.cpp
+++ b/src/proc/mobject/builder/nodecreatertool.cpp
@@ -1,8 +1,8 @@
 /*
   NodeCreaterTool  -  central Tool implementing the Renderengine building
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/nodecreatertool.hpp b/src/proc/mobject/builder/nodecreatertool.hpp
index 6eebc98c4..26a033d26 100644
--- a/src/proc/mobject/builder/nodecreatertool.hpp
+++ b/src/proc/mobject/builder/nodecreatertool.hpp
@@ -1,8 +1,8 @@
 /*
   NODECREATERTOOL.hpp  -  central Tool implementing the Renderengine building
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/segmentationtool.cpp b/src/proc/mobject/builder/segmentationtool.cpp
index a98a63f83..6f07e7d4f 100644
--- a/src/proc/mobject/builder/segmentationtool.cpp
+++ b/src/proc/mobject/builder/segmentationtool.cpp
@@ -1,8 +1,8 @@
 /*
   SegmentationTool  -  Tool for creating a partitioning of the current timeline
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/segmentationtool.hpp b/src/proc/mobject/builder/segmentationtool.hpp
index f913836ca..aa09d80d3 100644
--- a/src/proc/mobject/builder/segmentationtool.hpp
+++ b/src/proc/mobject/builder/segmentationtool.hpp
@@ -1,8 +1,8 @@
 /*
   SEGMENTATIONTOOL.hpp  -  Tool for creating a partitioning of the current timeline
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/toolfactory.cpp b/src/proc/mobject/builder/toolfactory.cpp
index 456ee568b..8e1b14631 100644
--- a/src/proc/mobject/builder/toolfactory.cpp
+++ b/src/proc/mobject/builder/toolfactory.cpp
@@ -1,8 +1,8 @@
 /*
   ToolFactory  -  supply of Tool implementations for the Builder
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builder/toolfactory.hpp b/src/proc/mobject/builder/toolfactory.hpp
index d39b0e7c7..2061b4fd2 100644
--- a/src/proc/mobject/builder/toolfactory.hpp
+++ b/src/proc/mobject/builder/toolfactory.hpp
@@ -1,8 +1,8 @@
 /*
   TOOLFACTORY.hpp  -  supply of Tool implementations for the Builder
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builderfacade.cpp b/src/proc/mobject/builderfacade.cpp
index 8ebed9d08..149862f98 100644
--- a/src/proc/mobject/builderfacade.cpp
+++ b/src/proc/mobject/builderfacade.cpp
@@ -1,8 +1,8 @@
 /*
   BuilderFacade  -  Facade and service access point for the Builder Subsystem
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/builderfacade.hpp b/src/proc/mobject/builderfacade.hpp
index c0b8398e1..59023853c 100644
--- a/src/proc/mobject/builderfacade.hpp
+++ b/src/proc/mobject/builderfacade.hpp
@@ -1,8 +1,8 @@
 /*
   BUILDERFACADE.hpp  -  Facade and service access point for the Builder Subsystem
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/controller/pathmanager.cpp b/src/proc/mobject/controller/pathmanager.cpp
index b197784a6..bf3c359ab 100644
--- a/src/proc/mobject/controller/pathmanager.cpp
+++ b/src/proc/mobject/controller/pathmanager.cpp
@@ -1,8 +1,8 @@
 /*
   PathManager  -  Manager for deciding the actual render strategy
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/controller/pathmanager.hpp b/src/proc/mobject/controller/pathmanager.hpp
index fecc36021..a29cd2f94 100644
--- a/src/proc/mobject/controller/pathmanager.hpp
+++ b/src/proc/mobject/controller/pathmanager.hpp
@@ -1,8 +1,8 @@
 /*
   PATHMANAGER.hpp  -  Manager for deciding the actual render strategy
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/controller/renderstate.cpp b/src/proc/mobject/controller/renderstate.cpp
index f1db1dfbb..98ca2ccd1 100644
--- a/src/proc/mobject/controller/renderstate.cpp
+++ b/src/proc/mobject/controller/renderstate.cpp
@@ -1,8 +1,8 @@
 /*
   RenderState  -  renderengine state manager
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/controller/renderstate.hpp b/src/proc/mobject/controller/renderstate.hpp
index c73b3c647..c547772ea 100644
--- a/src/proc/mobject/controller/renderstate.hpp
+++ b/src/proc/mobject/controller/renderstate.hpp
@@ -1,8 +1,8 @@
 /*
   RENDERSTATE.hpp  -  renderengine state manager
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/explicitplacement.hpp b/src/proc/mobject/explicitplacement.hpp
index 416b1d4f1..307f38409 100644
--- a/src/proc/mobject/explicitplacement.hpp
+++ b/src/proc/mobject/explicitplacement.hpp
@@ -1,8 +1,8 @@
 /*
   EXPLICITPLACEMENT.hpp  -  special Placement yielding an absolute location (Time,Track) for a MObject
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/interpolator.cpp b/src/proc/mobject/interpolator.cpp
index 3767770ca..8ceb9ad86 100644
--- a/src/proc/mobject/interpolator.cpp
+++ b/src/proc/mobject/interpolator.cpp
@@ -1,8 +1,8 @@
 /*
   Interpolator  -  denotes a facility to get (continuously interpolated) parameter values
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/interpolator.hpp b/src/proc/mobject/interpolator.hpp
index 7ff3e371a..843cd52bc 100644
--- a/src/proc/mobject/interpolator.hpp
+++ b/src/proc/mobject/interpolator.hpp
@@ -1,8 +1,8 @@
 /*
   INTERPOLATOR.hpp  -  denotes a facility to get (continuously interpolated) parameter values
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/mobject.cpp b/src/proc/mobject/mobject.cpp
index e8692abf7..cd6c0011b 100644
--- a/src/proc/mobject/mobject.cpp
+++ b/src/proc/mobject/mobject.cpp
@@ -1,8 +1,8 @@
 /*
   MObject  -  Key Abstraction: A Media Object in the Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp
index 634322470..b7c139f93 100644
--- a/src/proc/mobject/mobject.hpp
+++ b/src/proc/mobject/mobject.hpp
@@ -1,8 +1,8 @@
 /*
   MOBJECT.hpp  -  Key Abstraction: A Media Object in the Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/parameter.cpp b/src/proc/mobject/parameter.cpp
index b603a2055..280cbc69b 100644
--- a/src/proc/mobject/parameter.cpp
+++ b/src/proc/mobject/parameter.cpp
@@ -1,8 +1,8 @@
 /*
   Parameter  -  representation of an automatable effect/plugin parameter
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/parameter.hpp b/src/proc/mobject/parameter.hpp
index da75bb48e..00154dff5 100644
--- a/src/proc/mobject/parameter.hpp
+++ b/src/proc/mobject/parameter.hpp
@@ -1,8 +1,8 @@
 /*
   PARAMETER.hpp  -  representation of an automatable effect/plugin parameter
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/paramprovider.cpp b/src/proc/mobject/paramprovider.cpp
index e9a6b26ce..8b5da785a 100644
--- a/src/proc/mobject/paramprovider.cpp
+++ b/src/proc/mobject/paramprovider.cpp
@@ -1,8 +1,8 @@
 /*
   ParamProvider  -  interface denoting a source for actual Parameter values
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/paramprovider.hpp b/src/proc/mobject/paramprovider.hpp
index 9057167be..fdcaff2a8 100644
--- a/src/proc/mobject/paramprovider.hpp
+++ b/src/proc/mobject/paramprovider.hpp
@@ -1,8 +1,8 @@
 /*
   PARAMPROVIDER.hpp  -  interface denoting a source for actual Parameter values
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/placement.cpp b/src/proc/mobject/placement.cpp
index 7929a7a6f..452528627 100644
--- a/src/proc/mobject/placement.cpp
+++ b/src/proc/mobject/placement.cpp
@@ -1,8 +1,8 @@
 /*
   Placement  -  Key Abstraction: a way to place and locate a Media Object
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/placement.hpp b/src/proc/mobject/placement.hpp
index 63d96c0fb..71c654308 100644
--- a/src/proc/mobject/placement.hpp
+++ b/src/proc/mobject/placement.hpp
@@ -1,8 +1,8 @@
 /*
   PLACEMENT.hpp  -  Key Abstraction: a way to place and locate a Media Object
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp
index c61bc938a..48473d298 100644
--- a/src/proc/mobject/session.hpp
+++ b/src/proc/mobject/session.hpp
@@ -1,8 +1,8 @@
 /*
   SESSION.hpp  -  holds the complete session to be edited by the user
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/abstractmo.cpp b/src/proc/mobject/session/abstractmo.cpp
index 8316ae5d9..e484eee6e 100644
--- a/src/proc/mobject/session/abstractmo.cpp
+++ b/src/proc/mobject/session/abstractmo.cpp
@@ -1,8 +1,8 @@
 /*
   AbstractMO  -  abstract base class for all Media Objects
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/abstractmo.hpp b/src/proc/mobject/session/abstractmo.hpp
index bd4fd5785..45942986d 100644
--- a/src/proc/mobject/session/abstractmo.hpp
+++ b/src/proc/mobject/session/abstractmo.hpp
@@ -1,8 +1,8 @@
 /*
   ABSTRACTMO.hpp  -  abstract base class for all Media Objects
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/allocation.cpp b/src/proc/mobject/session/allocation.cpp
index 0b070a9be..ae23185b8 100644
--- a/src/proc/mobject/session/allocation.cpp
+++ b/src/proc/mobject/session/allocation.cpp
@@ -1,8 +1,8 @@
 /*
   Allocation  -  objective to place a MObject in a specific way  
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/allocation.hpp b/src/proc/mobject/session/allocation.hpp
index 95a5b9a01..e668fb469 100644
--- a/src/proc/mobject/session/allocation.hpp
+++ b/src/proc/mobject/session/allocation.hpp
@@ -1,8 +1,8 @@
 /*
   ALLOCATION.hpp  -  objective to place a MObject in a specific way
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/auto.cpp b/src/proc/mobject/session/auto.cpp
index 6e046260b..a8ecf4c38 100644
--- a/src/proc/mobject/session/auto.cpp
+++ b/src/proc/mobject/session/auto.cpp
@@ -1,8 +1,8 @@
 /*
   Auto  -  Media Object holding automation data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/auto.hpp b/src/proc/mobject/session/auto.hpp
index d0b54cad6..0fcf831aa 100644
--- a/src/proc/mobject/session/auto.hpp
+++ b/src/proc/mobject/session/auto.hpp
@@ -1,8 +1,8 @@
 /*
   AUTO.hpp  -  Media Object holding automation data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/clip.cpp b/src/proc/mobject/session/clip.cpp
index 7ea375173..8b285e1ac 100644
--- a/src/proc/mobject/session/clip.cpp
+++ b/src/proc/mobject/session/clip.cpp
@@ -1,8 +1,8 @@
 /*
   Clip  -  a Media Clip
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/clip.hpp b/src/proc/mobject/session/clip.hpp
index fd87b1c39..a7ca8a363 100644
--- a/src/proc/mobject/session/clip.hpp
+++ b/src/proc/mobject/session/clip.hpp
@@ -1,8 +1,8 @@
 /*
   CLIP.hpp  -  a Media Clip
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/compoundclip.cpp b/src/proc/mobject/session/compoundclip.cpp
index 68694e136..caa8e83bd 100644
--- a/src/proc/mobject/session/compoundclip.cpp
+++ b/src/proc/mobject/session/compoundclip.cpp
@@ -1,8 +1,8 @@
 /*
   CompoundClip  -  compound of several clips (multichannel)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/compoundclip.hpp b/src/proc/mobject/session/compoundclip.hpp
index 332396a48..e2dfd9fd9 100644
--- a/src/proc/mobject/session/compoundclip.hpp
+++ b/src/proc/mobject/session/compoundclip.hpp
@@ -1,8 +1,8 @@
 /*
   COMPOUNDCLIP.hpp  -  compound of several clips (multichannel)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/edl.cpp b/src/proc/mobject/session/edl.cpp
index 84a3f6e4c..8665c5d7f 100644
--- a/src/proc/mobject/session/edl.cpp
+++ b/src/proc/mobject/session/edl.cpp
@@ -1,8 +1,8 @@
 /*
   EDL  -  the (high level) Edit Decision List within the current Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/edl.hpp b/src/proc/mobject/session/edl.hpp
index db3ad4971..1e9c7bece 100644
--- a/src/proc/mobject/session/edl.hpp
+++ b/src/proc/mobject/session/edl.hpp
@@ -1,8 +1,8 @@
 /*
   EDL.hpp  -  the (high level) Edit Decision List within the current Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/effect.cpp b/src/proc/mobject/session/effect.cpp
index 8a58ec7a6..e83f03119 100644
--- a/src/proc/mobject/session/effect.cpp
+++ b/src/proc/mobject/session/effect.cpp
@@ -1,8 +1,8 @@
 /*
   Effect  -  EDL representation of a pluggable and automatable effect.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/effect.hpp b/src/proc/mobject/session/effect.hpp
index 5255e718b..5831098d4 100644
--- a/src/proc/mobject/session/effect.hpp
+++ b/src/proc/mobject/session/effect.hpp
@@ -1,8 +1,8 @@
 /*
   EFFECT.hpp  -  EDL representation of a pluggable and automatable effect.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/fixedlocation.cpp b/src/proc/mobject/session/fixedlocation.cpp
index 150702bb0..238b8c011 100644
--- a/src/proc/mobject/session/fixedlocation.cpp
+++ b/src/proc/mobject/session/fixedlocation.cpp
@@ -1,8 +1,8 @@
 /*
   FixedLocation  - directly positioning a MObject to a fixed location  
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/fixedlocation.hpp b/src/proc/mobject/session/fixedlocation.hpp
index 8d4282443..c3b176d2e 100644
--- a/src/proc/mobject/session/fixedlocation.hpp
+++ b/src/proc/mobject/session/fixedlocation.hpp
@@ -1,8 +1,8 @@
 /*
   FIXEDLOCATION.hpp  -  directly positioning a MObject to a fixed location   
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/fixture.cpp b/src/proc/mobject/session/fixture.cpp
index deb2a6db1..bdad3f807 100644
--- a/src/proc/mobject/session/fixture.cpp
+++ b/src/proc/mobject/session/fixture.cpp
@@ -1,8 +1,8 @@
 /*
   Fixture  -  the (low level) representation of the EDL with explicit placement data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/fixture.hpp b/src/proc/mobject/session/fixture.hpp
index 78c0cdac5..208459b10 100644
--- a/src/proc/mobject/session/fixture.hpp
+++ b/src/proc/mobject/session/fixture.hpp
@@ -1,8 +1,8 @@
 /*
   FIXTURE.hpp  -  the (low level) representation of the EDL with explicit placement data
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/label.cpp b/src/proc/mobject/session/label.cpp
index e1f81728a..c5d85907d 100644
--- a/src/proc/mobject/session/label.cpp
+++ b/src/proc/mobject/session/label.cpp
@@ -1,8 +1,8 @@
 /*
   Label  -  a user visible Marker or Tag  
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/label.hpp b/src/proc/mobject/session/label.hpp
index 54080f0f3..b968baa68 100644
--- a/src/proc/mobject/session/label.hpp
+++ b/src/proc/mobject/session/label.hpp
@@ -1,8 +1,8 @@
 /*
   LABEL.hpp  -  a user visible Marker or Tag
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/locatingpin.cpp b/src/proc/mobject/session/locatingpin.cpp
index fc290c4be..de443c3a5 100644
--- a/src/proc/mobject/session/locatingpin.cpp
+++ b/src/proc/mobject/session/locatingpin.cpp
@@ -1,8 +1,8 @@
 /*
   LocatingPin  -  Chaining and constraining the Placement of a Media Object
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp
index cfa8416ba..dfc7f8696 100644
--- a/src/proc/mobject/session/locatingpin.hpp
+++ b/src/proc/mobject/session/locatingpin.hpp
@@ -1,8 +1,8 @@
 /*
   LOCATINGPIN.hpp  -  Chaining and constraining the Placement of a Media Object
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/meta.cpp b/src/proc/mobject/session/meta.cpp
index 0b6cb3ad8..cb61756d5 100644
--- a/src/proc/mobject/session/meta.cpp
+++ b/src/proc/mobject/session/meta.cpp
@@ -1,8 +1,8 @@
 /*
   Meta  -  abstract base class of all MObjects representing meta data or processing instructions
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/meta.hpp b/src/proc/mobject/session/meta.hpp
index 6810cce03..b45d30eb5 100644
--- a/src/proc/mobject/session/meta.hpp
+++ b/src/proc/mobject/session/meta.hpp
@@ -1,8 +1,8 @@
 /*
   META.hpp  -  abstract base class of all MObjects representing meta data or processing instructions
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/mobjectfactory.cpp b/src/proc/mobject/session/mobjectfactory.cpp
index c86da719b..418909b04 100644
--- a/src/proc/mobject/session/mobjectfactory.cpp
+++ b/src/proc/mobject/session/mobjectfactory.cpp
@@ -1,8 +1,8 @@
 /*
   MObjectFactory  -  creating concrete MObject subclass instances
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp
index 3bc27a2a2..50602b7e5 100644
--- a/src/proc/mobject/session/mobjectfactory.hpp
+++ b/src/proc/mobject/session/mobjectfactory.hpp
@@ -1,8 +1,8 @@
 /*
   MOBJECTFACTORY.hpp  -  creating concrete MObject subclass instances
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/relativelocation.cpp b/src/proc/mobject/session/relativelocation.cpp
index 6488d4d77..7ae39ff3a 100644
--- a/src/proc/mobject/session/relativelocation.cpp
+++ b/src/proc/mobject/session/relativelocation.cpp
@@ -1,8 +1,8 @@
 /*
   RelativeLocation  -  Placement implementation attaching MObjects relative to another one
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/relativelocation.hpp b/src/proc/mobject/session/relativelocation.hpp
index 810476c04..33b857053 100644
--- a/src/proc/mobject/session/relativelocation.hpp
+++ b/src/proc/mobject/session/relativelocation.hpp
@@ -1,8 +1,8 @@
 /*
   RELATIVELOCATION.hpp  -  Placement implementation attaching MObjects relative to another one
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/segment.cpp b/src/proc/mobject/session/segment.cpp
index 7d8f3ca1a..3c34896ab 100644
--- a/src/proc/mobject/session/segment.cpp
+++ b/src/proc/mobject/session/segment.cpp
@@ -1,8 +1,8 @@
 /*
   Segment  -  Segment of the Timeline.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/segment.hpp b/src/proc/mobject/session/segment.hpp
index 22305b5e4..46b5929d4 100644
--- a/src/proc/mobject/session/segment.hpp
+++ b/src/proc/mobject/session/segment.hpp
@@ -1,8 +1,8 @@
 /*
   SEGMENT.hpp  -  Segment of the Timeline.
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/session.cpp b/src/proc/mobject/session/session.cpp
index 6e9b8f3fe..2e81d752e 100644
--- a/src/proc/mobject/session/session.cpp
+++ b/src/proc/mobject/session/session.cpp
@@ -1,8 +1,8 @@
 /*
   Session  -  holds the complete session to be edited by the user
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/sessionimpl.cpp b/src/proc/mobject/session/sessionimpl.cpp
index d89edac15..e0cab87cc 100644
--- a/src/proc/mobject/session/sessionimpl.cpp
+++ b/src/proc/mobject/session/sessionimpl.cpp
@@ -1,8 +1,8 @@
 /*
   SessionImpl  -  holds the complete session data to be edited by the user
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/sessionimpl.hpp b/src/proc/mobject/session/sessionimpl.hpp
index 734a74a01..d145c4fe5 100644
--- a/src/proc/mobject/session/sessionimpl.hpp
+++ b/src/proc/mobject/session/sessionimpl.hpp
@@ -1,8 +1,8 @@
 /*
   SESSIONIMPL.hpp  -  holds the complete session data to be edited by the user
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/sessmanagerimpl.cpp b/src/proc/mobject/session/sessmanagerimpl.cpp
index 9031bb712..919a56294 100644
--- a/src/proc/mobject/session/sessmanagerimpl.cpp
+++ b/src/proc/mobject/session/sessmanagerimpl.cpp
@@ -1,8 +1,8 @@
 /*
   SessManagerImpl  -  global session access and lifecycle
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/simpleclip.cpp b/src/proc/mobject/session/simpleclip.cpp
index 053a5f148..97796a00e 100644
--- a/src/proc/mobject/session/simpleclip.cpp
+++ b/src/proc/mobject/session/simpleclip.cpp
@@ -1,8 +1,8 @@
 /*
   SimpleClip  -  Elementary clip (single media stream only)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/simpleclip.hpp b/src/proc/mobject/session/simpleclip.hpp
index 446090cc1..f0dc62c02 100644
--- a/src/proc/mobject/session/simpleclip.hpp
+++ b/src/proc/mobject/session/simpleclip.hpp
@@ -1,8 +1,8 @@
 /*
   SIMPLECLIP.hpp  -  Elementary clip (single media stream only)
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/track.cpp b/src/proc/mobject/session/track.cpp
index 05b0dd31f..33dd7ed6b 100644
--- a/src/proc/mobject/session/track.cpp
+++ b/src/proc/mobject/session/track.cpp
@@ -1,8 +1,8 @@
 /*
   Track  -  descriptor for one track in the Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/mobject/session/track.hpp b/src/proc/mobject/session/track.hpp
index 42d5fe783..3df1e9682 100644
--- a/src/proc/mobject/session/track.hpp
+++ b/src/proc/mobject/session/track.hpp
@@ -1,8 +1,8 @@
 /*
   TRACK.hpp  -  descriptor for one track in the Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/stateproxy.cpp b/src/proc/stateproxy.cpp
index 9d4004d0f..f4125a41e 100644
--- a/src/proc/stateproxy.cpp
+++ b/src/proc/stateproxy.cpp
@@ -1,8 +1,8 @@
 /*
   StateProxy  -  Key Interface representing a render process and encapsulating state
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/src/proc/stateproxy.hpp b/src/proc/stateproxy.hpp
index c1ce6d52f..7c338bd1d 100644
--- a/src/proc/stateproxy.hpp
+++ b/src/proc/stateproxy.hpp
@@ -1,8 +1,8 @@
 /*
   STATEPROXY.hpp  -  Key Interface representing a render process and encapsulating state
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 109cd44b9..26fe4b678 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C)         CinelerraCV
+#  Copyright (C)         Lumiera.org
 #    2007,               Christian Thaeter <ct@pipapo.org>
 #                        Hermann Vosseler <Ichthyostega@web.de>
 #
diff --git a/tests/bugs/bugmain.c b/tests/bugs/bugmain.c
index 4331f4516..7823b279e 100644
--- a/tests/bugs/bugmain.c
+++ b/tests/bugs/bugmain.c
@@ -1,8 +1,8 @@
 /*
   errortest.c  -  executable for running bug regression tests
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/backend/mediaaccessmock.cpp b/tests/components/backend/mediaaccessmock.cpp
index d980c83d5..071ad5cef 100644
--- a/tests/components/backend/mediaaccessmock.cpp
+++ b/tests/components/backend/mediaaccessmock.cpp
@@ -1,8 +1,8 @@
 /*
   MediaAccessMock.hpp  -  a test (stub) target object for testing the factories
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/backend/mediaaccessmock.hpp b/tests/components/backend/mediaaccessmock.hpp
index 2b70ca3fa..e11d0a67a 100644
--- a/tests/components/backend/mediaaccessmock.hpp
+++ b/tests/components/backend/mediaaccessmock.hpp
@@ -1,8 +1,8 @@
 /*
   MEDIAACCESSMOCK.hpp  -  a test (stub) target object for testing the factories
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/backend/mediaaccessmocktest.cpp b/tests/components/backend/mediaaccessmocktest.cpp
index 110d2b3cd..327a7bc74 100644
--- a/tests/components/backend/mediaaccessmocktest.cpp
+++ b/tests/components/backend/mediaaccessmocktest.cpp
@@ -1,8 +1,8 @@
 /*
   MediaAccessMock(Test)  -  checking our Test Mock replacing the MediaAccessFacade
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/appconfigtest.cpp b/tests/components/common/appconfigtest.cpp
index 49266c4ae..d65e29402 100644
--- a/tests/components/common/appconfigtest.cpp
+++ b/tests/components/common/appconfigtest.cpp
@@ -1,8 +1,8 @@
 /*
   Appconfig(Test)  -  accessing the allwasy-available Appconfig singleton
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/exceptionerrortest.cpp b/tests/components/common/exceptionerrortest.cpp
index 51e621dbc..987c77d19 100644
--- a/tests/components/common/exceptionerrortest.cpp
+++ b/tests/components/common/exceptionerrortest.cpp
@@ -1,8 +1,8 @@
 /*
   Exceptionhandlin(Test)  -  throwing and catching our exception type
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/factoryspecialtest.cpp b/tests/components/common/factoryspecialtest.cpp
index e9848c599..de9eeee8b 100644
--- a/tests/components/common/factoryspecialtest.cpp
+++ b/tests/components/common/factoryspecialtest.cpp
@@ -1,8 +1,8 @@
 /*
   Factory-Special(Test)  -  testing the more advanced features of factory
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/factorytest.cpp b/tests/components/common/factorytest.cpp
index 4648fe6d8..875266fce 100644
--- a/tests/components/common/factorytest.cpp
+++ b/tests/components/common/factorytest.cpp
@@ -1,8 +1,8 @@
 /*
   Factory(Test)  -  unittest for the object creating factory
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/sanitizedidentifiertest.cpp b/tests/components/common/sanitizedidentifiertest.cpp
index a6dba2c79..416d81c58 100644
--- a/tests/components/common/sanitizedidentifiertest.cpp
+++ b/tests/components/common/sanitizedidentifiertest.cpp
@@ -1,8 +1,8 @@
 /*
   SanitizedIdentifier(Test)  -  remove non-standard-chars and punctuation
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/singletontest.cpp b/tests/components/common/singletontest.cpp
index ce88d5245..558d7e674 100644
--- a/tests/components/common/singletontest.cpp
+++ b/tests/components/common/singletontest.cpp
@@ -1,8 +1,8 @@
 /*
   Singleton(Test)  -  unittest for our Singleton template
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/singletontestmocktest.cpp b/tests/components/common/singletontestmocktest.cpp
index b33dda5d2..b90b1a73c 100644
--- a/tests/components/common/singletontestmocktest.cpp
+++ b/tests/components/common/singletontestmocktest.cpp
@@ -1,8 +1,8 @@
 /*
   SingletonTestMock(Test)  -  using Singleton for injecting Test-Mocks
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/test/cmdlinewrappertest.cpp b/tests/components/common/test/cmdlinewrappertest.cpp
index 84b0780c1..668ce8121 100644
--- a/tests/components/common/test/cmdlinewrappertest.cpp
+++ b/tests/components/common/test/cmdlinewrappertest.cpp
@@ -1,8 +1,8 @@
 /*
   Cmdlinewrapper(Test)  -  build vector of tokens from cmdline, various conversions
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/test/testoptiontest.cpp b/tests/components/common/test/testoptiontest.cpp
index aac3269f0..7f3da81c6 100644
--- a/tests/components/common/test/testoptiontest.cpp
+++ b/tests/components/common/test/testoptiontest.cpp
@@ -1,8 +1,8 @@
 /*
   TestOption(Test)  -  parsing of cmd line options for running Testcases
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/testtargetobj.hpp b/tests/components/common/testtargetobj.hpp
index d367f4cd6..8a0728b95 100644
--- a/tests/components/common/testtargetobj.hpp
+++ b/tests/components/common/testtargetobj.hpp
@@ -1,8 +1,8 @@
 /*
   TESTTARGETOBJ.hpp  -  a test (stub) target object for testing the factories
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/typelisttest.cpp b/tests/components/common/typelisttest.cpp
index ddd13c776..1a2e383e8 100644
--- a/tests/components/common/typelisttest.cpp
+++ b/tests/components/common/typelisttest.cpp
@@ -1,8 +1,8 @@
 /*
   TypeList(Test)  -  check the typelist metaprogramming facility
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/visitingtoolconcept.cpp b/tests/components/common/visitingtoolconcept.cpp
index dbccfe0b3..16578b6be 100644
--- a/tests/components/common/visitingtoolconcept.cpp
+++ b/tests/components/common/visitingtoolconcept.cpp
@@ -1,8 +1,8 @@
 /*
   VisitingTool(Concept)  -  working out our own Visitor library implementation
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/visitingtoolextendedtest.cpp b/tests/components/common/visitingtoolextendedtest.cpp
index 076a3d48e..a25ebd95a 100644
--- a/tests/components/common/visitingtoolextendedtest.cpp
+++ b/tests/components/common/visitingtoolextendedtest.cpp
@@ -1,8 +1,8 @@
 /*
   VisitingToolExtended(Test)  -  check obscure corner cases of visitor lib implementation
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/common/visitingtooltest.cpp b/tests/components/common/visitingtooltest.cpp
index 983a9ab0b..10edf233d 100644
--- a/tests/components/common/visitingtooltest.cpp
+++ b/tests/components/common/visitingtooltest.cpp
@@ -1,8 +1,8 @@
 /*
   VisitingTool(Test)  -  check the standard visitor use case
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/helloworldtest.cpp b/tests/components/helloworldtest.cpp
index 3aa516ca3..8398f19ad 100644
--- a/tests/components/helloworldtest.cpp
+++ b/tests/components/helloworldtest.cpp
@@ -1,8 +1,8 @@
 /*
   HelloWorld(Test)  -  how to use this test framework...
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/mainsuite.cpp b/tests/components/mainsuite.cpp
index dac63ba7c..924a982e3 100644
--- a/tests/components/mainsuite.cpp
+++ b/tests/components/mainsuite.cpp
@@ -1,8 +1,8 @@
 /*
   mainsuite.cpp  -  "the" cinelerra3 self test suite
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
 
   This program is free software; you can redistribute it and/or
diff --git a/tests/components/proc/asset/assetcategorytest.cpp b/tests/components/proc/asset/assetcategorytest.cpp
index af671d91f..ef02aaafe 100644
--- a/tests/components/proc/asset/assetcategorytest.cpp
+++ b/tests/components/proc/asset/assetcategorytest.cpp
@@ -1,8 +1,8 @@
 /*
   AssetCategory(Test)  -  verifying Asset category tuple functions
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/assetdiagnostics.hpp b/tests/components/proc/asset/assetdiagnostics.hpp
index c8df758f8..df852bb2e 100644
--- a/tests/components/proc/asset/assetdiagnostics.hpp
+++ b/tests/components/proc/asset/assetdiagnostics.hpp
@@ -1,8 +1,8 @@
 /*
   ASSETDIAGNOSTICS.hpp  -  collection of test and debug helpers
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/compoundmediatest.cpp b/tests/components/proc/asset/compoundmediatest.cpp
index ba11c1bef..73e4056bc 100644
--- a/tests/components/proc/asset/compoundmediatest.cpp
+++ b/tests/components/proc/asset/compoundmediatest.cpp
@@ -1,8 +1,8 @@
 /*
   CompoundMedia(Test)  -  handling multichannel Media Assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/createassettest.cpp b/tests/components/proc/asset/createassettest.cpp
index 01ae76efe..fa28d4472 100644
--- a/tests/components/proc/asset/createassettest.cpp
+++ b/tests/components/proc/asset/createassettest.cpp
@@ -1,8 +1,8 @@
 /*
   CreateAsset(Test)  -  constructing and registering Assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/deleteassettest.cpp b/tests/components/proc/asset/deleteassettest.cpp
index 15430ce95..5a0ef2ba4 100644
--- a/tests/components/proc/asset/deleteassettest.cpp
+++ b/tests/components/proc/asset/deleteassettest.cpp
@@ -1,8 +1,8 @@
 /*
   DeleteAsset(Test)  -  deleting and Asset with all dependencies
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/dependantassetstest.cpp b/tests/components/proc/asset/dependantassetstest.cpp
index 3842ad933..0b7cbd0e9 100644
--- a/tests/components/proc/asset/dependantassetstest.cpp
+++ b/tests/components/proc/asset/dependantassetstest.cpp
@@ -1,8 +1,8 @@
 /*
   DependantAssets(Test)  -  unittest for the object creating factory
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/identityofassetstest.cpp b/tests/components/proc/asset/identityofassetstest.cpp
index adf7d35ea..655c4fb40 100644
--- a/tests/components/proc/asset/identityofassetstest.cpp
+++ b/tests/components/proc/asset/identityofassetstest.cpp
@@ -1,8 +1,8 @@
 /*
   IdentityOfAssets(Test)  -  Asset object identity and versioning
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/makecliptest.cpp b/tests/components/proc/asset/makecliptest.cpp
index cb8999c55..83702d7c5 100644
--- a/tests/components/proc/asset/makecliptest.cpp
+++ b/tests/components/proc/asset/makecliptest.cpp
@@ -1,8 +1,8 @@
 /*
   MakeClip(Test)  -  create a Clip from a Media Asset
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/mediastructurequerytest.cpp b/tests/components/proc/asset/mediastructurequerytest.cpp
index 11d758b63..866178fd4 100644
--- a/tests/components/proc/asset/mediastructurequerytest.cpp
+++ b/tests/components/proc/asset/mediastructurequerytest.cpp
@@ -1,8 +1,8 @@
 /*
   MediaStructureQuery(Test)  -  check functionallity used for creating media assets
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/orderingofassetstest.cpp b/tests/components/proc/asset/orderingofassetstest.cpp
index dba64433d..26d6aa50a 100644
--- a/tests/components/proc/asset/orderingofassetstest.cpp
+++ b/tests/components/proc/asset/orderingofassetstest.cpp
@@ -1,8 +1,8 @@
 /*
   OrderingOfAssets(Test)  -  equality and comparisons
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/testasset.cpp b/tests/components/proc/asset/testasset.cpp
index ffc035722..b48b64da1 100644
--- a/tests/components/proc/asset/testasset.cpp
+++ b/tests/components/proc/asset/testasset.cpp
@@ -1,8 +1,8 @@
 /*
   TestClip  -  test clip (stub) for checking EDL/Session functionality
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/testasset.hpp b/tests/components/proc/asset/testasset.hpp
index 9e7e66da9..05f82c79e 100644
--- a/tests/components/proc/asset/testasset.hpp
+++ b/tests/components/proc/asset/testasset.hpp
@@ -1,8 +1,8 @@
 /*
   TESTASSET.hpp  -  test asset (stub) for checking internal asset functionality
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/asset/testclipasset.hpp b/tests/components/proc/asset/testclipasset.hpp
index 35e56525d..8bb0fa1ad 100644
--- a/tests/components/proc/asset/testclipasset.hpp
+++ b/tests/components/proc/asset/testclipasset.hpp
@@ -1,8 +1,8 @@
 /*
   TESTCLIPASSET.hpp  -  test Media-Asset (clip) for checking Assets and MObjects
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/engine/sourcenodetest.cpp b/tests/components/proc/engine/sourcenodetest.cpp
index 6177475b0..35127ab4a 100644
--- a/tests/components/proc/engine/sourcenodetest.cpp
+++ b/tests/components/proc/engine/sourcenodetest.cpp
@@ -1,8 +1,8 @@
 /*
   SourceNode(Test)  -  unit test of the source readering render node
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/builder/buildertooltest.cpp b/tests/components/proc/mobject/builder/buildertooltest.cpp
index c48b05627..8a445ef18 100644
--- a/tests/components/proc/mobject/builder/buildertooltest.cpp
+++ b/tests/components/proc/mobject/builder/buildertooltest.cpp
@@ -1,8 +1,8 @@
 /*
   BuilderTool(Test)  -  specialized form of the acyclic visitor
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/builder/buildsegmenttest.cpp b/tests/components/proc/mobject/builder/buildsegmenttest.cpp
index 2e6a8fb9b..82de68330 100644
--- a/tests/components/proc/mobject/builder/buildsegmenttest.cpp
+++ b/tests/components/proc/mobject/builder/buildsegmenttest.cpp
@@ -1,8 +1,8 @@
 /*
   BuildSegment(Test)  -  building the render-tree for a segment of the EDL
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/controller/rendersegmenttest.cpp b/tests/components/proc/mobject/controller/rendersegmenttest.cpp
index b99965946..fac5568aa 100644
--- a/tests/components/proc/mobject/controller/rendersegmenttest.cpp
+++ b/tests/components/proc/mobject/controller/rendersegmenttest.cpp
@@ -1,8 +1,8 @@
 /*
   RenderSegment(Test)  -  Proc-Layer Integrationtest
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/placementbasictest.cpp b/tests/components/proc/mobject/placementbasictest.cpp
index f26b0ab47..16b6a80d0 100644
--- a/tests/components/proc/mobject/placementbasictest.cpp
+++ b/tests/components/proc/mobject/placementbasictest.cpp
@@ -1,8 +1,8 @@
 /*
   PlacementBasic(Test)  -  basic Placement and MObject handling
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/addcliptest.cpp b/tests/components/proc/mobject/session/addcliptest.cpp
index cf5a11d77..ffb794e95 100644
--- a/tests/components/proc/mobject/session/addcliptest.cpp
+++ b/tests/components/proc/mobject/session/addcliptest.cpp
@@ -1,8 +1,8 @@
 /*
   AddClip(Test)  -  adding an Clip-MObject to the EDL/Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/deletecliptest.cpp b/tests/components/proc/mobject/session/deletecliptest.cpp
index bc7dc2229..6f1e387e5 100644
--- a/tests/components/proc/mobject/session/deletecliptest.cpp
+++ b/tests/components/proc/mobject/session/deletecliptest.cpp
@@ -1,8 +1,8 @@
 /*
   DeleteClip(Test)  -  removing an Clip-MObject from the Session
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/rebuildfixturetest.cpp b/tests/components/proc/mobject/session/rebuildfixturetest.cpp
index 48d2726ac..ffb43a32b 100644
--- a/tests/components/proc/mobject/session/rebuildfixturetest.cpp
+++ b/tests/components/proc/mobject/session/rebuildfixturetest.cpp
@@ -1,8 +1,8 @@
 /*
   RebuildFixture(Test)  -  (re)building the explicit placements
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/sessionmanagertest.cpp b/tests/components/proc/mobject/session/sessionmanagertest.cpp
index 409e53b46..3dcf1716d 100644
--- a/tests/components/proc/mobject/session/sessionmanagertest.cpp
+++ b/tests/components/proc/mobject/session/sessionmanagertest.cpp
@@ -1,8 +1,8 @@
 /*
   SessionManager(Test)  -  accessing, loading and saving the Session/EDL
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/sessionstructuretest.cpp b/tests/components/proc/mobject/session/sessionstructuretest.cpp
index 46fe59aee..d079ab01f 100644
--- a/tests/components/proc/mobject/session/sessionstructuretest.cpp
+++ b/tests/components/proc/mobject/session/sessionstructuretest.cpp
@@ -1,8 +1,8 @@
 /*
   SessionStructure(Test)  -  verifying basic Session/EDL structure
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/testclip.cpp b/tests/components/proc/mobject/session/testclip.cpp
index d79124020..ce659e708 100644
--- a/tests/components/proc/mobject/session/testclip.cpp
+++ b/tests/components/proc/mobject/session/testclip.cpp
@@ -1,8 +1,8 @@
 /*
   TestClip  -  test clip (stub) for checking EDL/Session functionality
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/testclip.hpp b/tests/components/proc/mobject/session/testclip.hpp
index 77209e84d..63ac8475a 100644
--- a/tests/components/proc/mobject/session/testclip.hpp
+++ b/tests/components/proc/mobject/session/testclip.hpp
@@ -1,8 +1,8 @@
 /*
   TESTCLIP.hpp  -  test clip (stub) for checking EDL/Session functionality
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/components/proc/mobject/session/testsession1.hpp b/tests/components/proc/mobject/session/testsession1.hpp
index b749d084d..d9c422f2f 100644
--- a/tests/components/proc/mobject/session/testsession1.hpp
+++ b/tests/components/proc/mobject/session/testsession1.hpp
@@ -1,8 +1,8 @@
 /*
   TESTSESSION1.hpp  -  complete session configuration used for various tests
  
-  Copyright (C)         CinelerraCV
-    2007,               Hermann Vosseler <Ichthyostega@web.de>
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/error/errortest.c b/tests/error/errortest.c
index 96d49b851..0fd95b600 100644
--- a/tests/error/errortest.c
+++ b/tests/error/errortest.c
@@ -1,8 +1,8 @@
 /*
   errortest.c  -  test error handling
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/library/test-llist.c b/tests/library/test-llist.c
index 66cc50ade..bf6c5aed5 100644
--- a/tests/library/test-llist.c
+++ b/tests/library/test-llist.c
@@ -1,8 +1,8 @@
 /*
   test-llist.c  -  test the linked lis lib
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/library/test-references.c b/tests/library/test-references.c
index f00de97b2..f56c7c9d7 100644
--- a/tests/library/test-references.c
+++ b/tests/library/test-references.c
@@ -1,8 +1,8 @@
 /*
   test-references.c  -  test strong and weak references
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/locking/condition.c b/tests/locking/condition.c
index 72b56285c..6483ac0a9 100644
--- a/tests/locking/condition.c
+++ b/tests/locking/condition.c
@@ -1,8 +1,8 @@
 /*
   test condition functions
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/locking/mutex.c b/tests/locking/mutex.c
index 3e9b58d8e..ed6a050eb 100644
--- a/tests/locking/mutex.c
+++ b/tests/locking/mutex.c
@@ -1,8 +1,8 @@
 /*
   test mutex functions
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/locking/test-condition.c b/tests/locking/test-condition.c
index 6f0f32365..cc8e5ae14 100644
--- a/tests/locking/test-condition.c
+++ b/tests/locking/test-condition.c
@@ -1,8 +1,8 @@
 /*
   test-locking.c  -  test locking functions
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/locking/test-locking.c b/tests/locking/test-locking.c
index 78bc99779..46455764b 100644
--- a/tests/locking/test-locking.c
+++ b/tests/locking/test-locking.c
@@ -1,8 +1,8 @@
 /*
   test-locking.c  -  test locking functions
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am
index fa5d52962..2cd33997e 100644
--- a/tests/plugin/Makefile.am
+++ b/tests/plugin/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C)         CinelerraCV
+#  Copyright (C)         Lumiera.org
 #    2007,               Christian Thaeter <ct@pipapo.org>
 #
 #  This program is free software; you can redistribute it and/or
diff --git a/tests/test.sh b/tests/test.sh
index 1e4256eb2..b692b3959 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash 
-#  Copyright (C)         CinelerraCV
+#  Copyright (C)         Lumiera.org
 #    2007,               Christian Thaeter <ct@pipapo.org>
 #                        Hermann Vosseler <Ichthyostega@web.de>
 #
diff --git a/tests/time/test-time.c b/tests/time/test-time.c
index 519a65781..01dd107ef 100644
--- a/tests/time/test-time.c
+++ b/tests/time/test-time.c
@@ -1,8 +1,8 @@
 /*
   test-time.c  -  test time and framerate functions
 
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
diff --git a/uml/cinelerra3/DIR_INFO b/uml/cinelerra3/DIR_INFO
deleted file mode 100644
index c9bfb0e73..000000000
--- a/uml/cinelerra3/DIR_INFO
+++ /dev/null
@@ -1 +0,0 @@
-cinelerra3 UML model
diff --git a/uml/cinelerra3/128005 b/uml/lumiera/128005
similarity index 98%
rename from uml/cinelerra3/128005
rename to uml/lumiera/128005
index e16107985..b6932706b 100644
--- a/uml/cinelerra3/128005
+++ b/uml/lumiera/128005
@@ -32,7 +32,7 @@ Not a real code package, rather a container for design drafts, specifications, d
     //component diagram settings
     package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
     draw_component_as_icon default show_component_req_prov default show_component_rea default
-    comment "The various Components comprising the Cinelerra3 Video editing Application"
+    comment "The various Components comprising the Lumiera Video editing Application"
     componentdiagram 128005 "Overview"
       package_name_in_tab default show_context default auto_label_position default draw_all_relations no shadow default
       draw_component_as_icon default show_component_req_prov default show_component_rea default
diff --git a/uml/cinelerra3/128005.diagram b/uml/lumiera/128005.diagram
similarity index 100%
rename from uml/cinelerra3/128005.diagram
rename to uml/lumiera/128005.diagram
diff --git a/uml/cinelerra3/128133 b/uml/lumiera/128133
similarity index 99%
rename from uml/cinelerra3/128133
rename to uml/lumiera/128133
index fe9ce6164..badc25cfd 100644
--- a/uml/cinelerra3/128133
+++ b/uml/lumiera/128133
@@ -116,7 +116,7 @@ ${members}};
 "
 	java_decl ""
 	idl_decl ""
-	comment "origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. \"blur\"). Default for all assets provided by the core cinelerra-3 codebase is \"cin3\"."
+	comment "origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. \"blur\"). Default for all assets provided by the core Lumiera codebase is \"lumi\"."
       end
 
       attribute 130949 "version"
diff --git a/uml/cinelerra3/128133.diagram b/uml/lumiera/128133.diagram
similarity index 100%
rename from uml/cinelerra3/128133.diagram
rename to uml/lumiera/128133.diagram
diff --git a/uml/cinelerra3/128138 b/uml/lumiera/128138
similarity index 100%
rename from uml/cinelerra3/128138
rename to uml/lumiera/128138
diff --git a/uml/cinelerra3/128181.diagram b/uml/lumiera/128181.diagram
similarity index 100%
rename from uml/cinelerra3/128181.diagram
rename to uml/lumiera/128181.diagram
diff --git a/uml/cinelerra3/128261 b/uml/lumiera/128261
similarity index 100%
rename from uml/cinelerra3/128261
rename to uml/lumiera/128261
diff --git a/uml/cinelerra3/128261.diagram b/uml/lumiera/128261.diagram
similarity index 100%
rename from uml/cinelerra3/128261.diagram
rename to uml/lumiera/128261.diagram
diff --git a/uml/cinelerra3/128389 b/uml/lumiera/128389
similarity index 100%
rename from uml/cinelerra3/128389
rename to uml/lumiera/128389
diff --git a/uml/cinelerra3/128389.diagram b/uml/lumiera/128389.diagram
similarity index 100%
rename from uml/cinelerra3/128389.diagram
rename to uml/lumiera/128389.diagram
diff --git a/uml/cinelerra3/128517 b/uml/lumiera/128517
similarity index 98%
rename from uml/cinelerra3/128517
rename to uml/lumiera/128517
index 6a6b8ee00..14fa5def7 100644
--- a/uml/cinelerra3/128517
+++ b/uml/lumiera/128517
@@ -45,7 +45,7 @@ format 40
     
     classdiagram 130181 "Hierarchy"
       draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
-      comment "Cinelerra Exception hierarchy"
+      comment "Lumiera Exception hierarchy"
       size A4
     end
 
@@ -406,7 +406,7 @@ ${class}::${name} ${(}${)}${volatile} ${throw}
 	
 	comment "perform initialization on first access. 
 A call is placed in static initialization code
-included in cinelerra.h; thus it will happen
+included in lumiera.h; thus it will happen
 ubiquitous very early."
       end
 
@@ -466,7 +466,7 @@ ${inlines}
       idl_decl ""
       explicit_switch_type ""
       
-      comment "We can basically reuse the Thread class design from cinelerra2, Thread becomes a baseclass for all Threads "
+      comment "We can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads "
     end
 
     class 128266 "Condition"
@@ -479,7 +479,7 @@ ${inlines}
       idl_decl ""
       explicit_switch_type ""
       
-      comment "I provided a reworked Condition class in my cinelerra2 repository"
+      comment "I provided a reworked Condition class in my Cinelerra2 repository"
       class 128522 "Lock"
 	visibility package 
 	cpp_decl "${comment}${template}class ${name}${inherit} {
@@ -503,7 +503,7 @@ ${inlines}
       idl_decl ""
       explicit_switch_type ""
       
-      comment "I provided a reworked Mutex class in my cinelerra2 repository"
+      comment "I provided a reworked Mutex class in my Cinelerra2 repository"
       class 128650 "Lock"
 	visibility package 
 	cpp_decl "${comment}${template}class ${name}${inherit} {
diff --git a/uml/cinelerra3/128517.diagram b/uml/lumiera/128517.diagram
similarity index 100%
rename from uml/cinelerra3/128517.diagram
rename to uml/lumiera/128517.diagram
diff --git a/uml/cinelerra3/128645 b/uml/lumiera/128645
similarity index 98%
rename from uml/cinelerra3/128645
rename to uml/lumiera/128645
index 523b89109..e1de4d311 100644
--- a/uml/cinelerra3/128645
+++ b/uml/lumiera/128645
@@ -32,14 +32,14 @@ format 40
     package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
     draw_component_as_icon default show_component_req_prov default show_component_rea default
     component_color lightred 
-    comment "defines and lists how the Cinelerra executable has to be created"
+    comment "defines and lists how the Lumiera executable has to be created"
     deploymentdiagram 129797 "Source Overview"
       package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
       draw_component_as_icon default show_component_req_prov default show_component_rea default
       size A4
     end
 
-    artifact 128005 "Cinelerra3"
+    artifact 128005 "Lumiera"
       stereotype "executable"
       associated_artifacts
 	artifact_ref 133509 // vrender
diff --git a/uml/cinelerra3/128645.diagram b/uml/lumiera/128645.diagram
similarity index 100%
rename from uml/cinelerra3/128645.diagram
rename to uml/lumiera/128645.diagram
diff --git a/uml/cinelerra3/128773 b/uml/lumiera/128773
similarity index 100%
rename from uml/cinelerra3/128773
rename to uml/lumiera/128773
diff --git a/uml/cinelerra3/128773.diagram b/uml/lumiera/128773.diagram
similarity index 100%
rename from uml/cinelerra3/128773.diagram
rename to uml/lumiera/128773.diagram
diff --git a/uml/cinelerra3/128901 b/uml/lumiera/128901
similarity index 100%
rename from uml/cinelerra3/128901
rename to uml/lumiera/128901
diff --git a/uml/cinelerra3/128901.diagram b/uml/lumiera/128901.diagram
similarity index 100%
rename from uml/cinelerra3/128901.diagram
rename to uml/lumiera/128901.diagram
diff --git a/uml/cinelerra3/129029 b/uml/lumiera/129029
similarity index 100%
rename from uml/cinelerra3/129029
rename to uml/lumiera/129029
diff --git a/uml/cinelerra3/129029.diagram b/uml/lumiera/129029.diagram
similarity index 100%
rename from uml/cinelerra3/129029.diagram
rename to uml/lumiera/129029.diagram
diff --git a/uml/cinelerra3/129157 b/uml/lumiera/129157
similarity index 100%
rename from uml/cinelerra3/129157
rename to uml/lumiera/129157
diff --git a/uml/cinelerra3/129157.diagram b/uml/lumiera/129157.diagram
similarity index 100%
rename from uml/cinelerra3/129157.diagram
rename to uml/lumiera/129157.diagram
diff --git a/uml/cinelerra3/129285 b/uml/lumiera/129285
similarity index 100%
rename from uml/cinelerra3/129285
rename to uml/lumiera/129285
diff --git a/uml/cinelerra3/129285.diagram b/uml/lumiera/129285.diagram
similarity index 100%
rename from uml/cinelerra3/129285.diagram
rename to uml/lumiera/129285.diagram
diff --git a/uml/cinelerra3/129413 b/uml/lumiera/129413
similarity index 98%
rename from uml/cinelerra3/129413
rename to uml/lumiera/129413
index efe41073b..a4a3e7283 100644
--- a/uml/cinelerra3/129413
+++ b/uml/lumiera/129413
@@ -29,7 +29,7 @@ format 40
   stereotype "src"
   cpp_h_dir "common"
   cpp_src_dir "common"
-  cpp_namespace "cinelerra"
+  cpp_namespace "lumiera"
   associated_diagram deploymentdiagram_ref 129797 // Source Overview
   comment "sourcecode package
 
@@ -121,7 +121,7 @@ ${namespace_end}"
 	class_ref 136069 // Invalid
 	class_ref 136197 // External
       end
-      comment "Cinelerra Exception Interface"
+      comment "Lumiera Exception Interface"
     end
 
     artifact 135173 "appconfig"
diff --git a/uml/cinelerra3/129413.diagram b/uml/lumiera/129413.diagram
similarity index 100%
rename from uml/cinelerra3/129413.diagram
rename to uml/lumiera/129413.diagram
diff --git a/uml/cinelerra3/129541 b/uml/lumiera/129541
similarity index 100%
rename from uml/cinelerra3/129541
rename to uml/lumiera/129541
diff --git a/uml/cinelerra3/129541.diagram b/uml/lumiera/129541.diagram
similarity index 100%
rename from uml/cinelerra3/129541.diagram
rename to uml/lumiera/129541.diagram
diff --git a/uml/cinelerra3/129669 b/uml/lumiera/129669
similarity index 100%
rename from uml/cinelerra3/129669
rename to uml/lumiera/129669
diff --git a/uml/cinelerra3/129669.diagram b/uml/lumiera/129669.diagram
similarity index 100%
rename from uml/cinelerra3/129669.diagram
rename to uml/lumiera/129669.diagram
diff --git a/uml/cinelerra3/129797 b/uml/lumiera/129797
similarity index 100%
rename from uml/cinelerra3/129797
rename to uml/lumiera/129797
diff --git a/uml/cinelerra3/129797.diagram b/uml/lumiera/129797.diagram
similarity index 96%
rename from uml/cinelerra3/129797.diagram
rename to uml/lumiera/129797.diagram
index 7c7216678..75bed9aaf 100644
--- a/uml/cinelerra3/129797.diagram
+++ b/uml/lumiera/129797.diagram
@@ -1,6 +1,6 @@
 format 40
 
-artifactcanvas 128005 artifact_ref 128005 // Cinelerra3
+artifactcanvas 128005 artifact_ref 128005 // Lumiera
   color midred
   xyz 47 45 2000
 packagecanvas 128133 
diff --git a/uml/cinelerra3/129925 b/uml/lumiera/129925
similarity index 100%
rename from uml/cinelerra3/129925
rename to uml/lumiera/129925
diff --git a/uml/cinelerra3/129925.diagram b/uml/lumiera/129925.diagram
similarity index 100%
rename from uml/cinelerra3/129925.diagram
rename to uml/lumiera/129925.diagram
diff --git a/uml/cinelerra3/130053 b/uml/lumiera/130053
similarity index 100%
rename from uml/cinelerra3/130053
rename to uml/lumiera/130053
diff --git a/uml/cinelerra3/130053.diagram b/uml/lumiera/130053.diagram
similarity index 100%
rename from uml/cinelerra3/130053.diagram
rename to uml/lumiera/130053.diagram
diff --git a/uml/cinelerra3/130181 b/uml/lumiera/130181
similarity index 100%
rename from uml/cinelerra3/130181
rename to uml/lumiera/130181
diff --git a/uml/cinelerra3/130181.diagram b/uml/lumiera/130181.diagram
similarity index 100%
rename from uml/cinelerra3/130181.diagram
rename to uml/lumiera/130181.diagram
diff --git a/uml/cinelerra3/130309 b/uml/lumiera/130309
similarity index 100%
rename from uml/cinelerra3/130309
rename to uml/lumiera/130309
diff --git a/uml/cinelerra3/130309.diagram b/uml/lumiera/130309.diagram
similarity index 100%
rename from uml/cinelerra3/130309.diagram
rename to uml/lumiera/130309.diagram
diff --git a/uml/cinelerra3/130437 b/uml/lumiera/130437
similarity index 100%
rename from uml/cinelerra3/130437
rename to uml/lumiera/130437
diff --git a/uml/cinelerra3/130437.diagram b/uml/lumiera/130437.diagram
similarity index 100%
rename from uml/cinelerra3/130437.diagram
rename to uml/lumiera/130437.diagram
diff --git a/uml/cinelerra3/130565 b/uml/lumiera/130565
similarity index 100%
rename from uml/cinelerra3/130565
rename to uml/lumiera/130565
diff --git a/uml/cinelerra3/130693 b/uml/lumiera/130693
similarity index 100%
rename from uml/cinelerra3/130693
rename to uml/lumiera/130693
diff --git a/uml/cinelerra3/130693.diagram b/uml/lumiera/130693.diagram
similarity index 100%
rename from uml/cinelerra3/130693.diagram
rename to uml/lumiera/130693.diagram
diff --git a/uml/cinelerra3/130821 b/uml/lumiera/130821
similarity index 98%
rename from uml/cinelerra3/130821
rename to uml/lumiera/130821
index 2823b3193..f7ca78b69 100644
--- a/uml/cinelerra3/130821
+++ b/uml/lumiera/130821
@@ -28,6 +28,6 @@ format 40
   
   cpp_h_dir "common"
   cpp_src_dir "common"
-  cpp_namespace "cinelerra::error"
+  cpp_namespace "lumiera::error"
   comment "Namespace for Exception Kinds"
 end
diff --git a/uml/cinelerra3/130821.diagram b/uml/lumiera/130821.diagram
similarity index 100%
rename from uml/cinelerra3/130821.diagram
rename to uml/lumiera/130821.diagram
diff --git a/uml/cinelerra3/130949 b/uml/lumiera/130949
similarity index 98%
rename from uml/cinelerra3/130949
rename to uml/lumiera/130949
index 16a88747b..cd38b33c7 100644
--- a/uml/cinelerra3/130949
+++ b/uml/lumiera/130949
@@ -28,6 +28,6 @@ format 40
   
   cpp_h_dir "common"
   cpp_src_dir "common"
-  cpp_namespace "cinelerra::visitor"
+  cpp_namespace "lumiera::visitor"
   comment "sub-namespace for visitor library implementation"
 end
diff --git a/uml/cinelerra3/130949.diagram b/uml/lumiera/130949.diagram
similarity index 100%
rename from uml/cinelerra3/130949.diagram
rename to uml/lumiera/130949.diagram
diff --git a/uml/cinelerra3/131077.diagram b/uml/lumiera/131077.diagram
similarity index 100%
rename from uml/cinelerra3/131077.diagram
rename to uml/lumiera/131077.diagram
diff --git a/uml/cinelerra3/131205.diagram b/uml/lumiera/131205.diagram
similarity index 100%
rename from uml/cinelerra3/131205.diagram
rename to uml/lumiera/131205.diagram
diff --git a/uml/cinelerra3/131333.diagram b/uml/lumiera/131333.diagram
similarity index 100%
rename from uml/cinelerra3/131333.diagram
rename to uml/lumiera/131333.diagram
diff --git a/uml/cinelerra3/134021.bodies b/uml/lumiera/134021.bodies
similarity index 100%
rename from uml/cinelerra3/134021.bodies
rename to uml/lumiera/134021.bodies
diff --git a/uml/cinelerra3/5.session b/uml/lumiera/5.session
similarity index 89%
rename from uml/cinelerra3/5.session
rename to uml/lumiera/5.session
index af98eb2ed..2d78dfa96 100644
--- a/uml/cinelerra3/5.session
+++ b/uml/lumiera/5.session
@@ -11,8 +11,10 @@ diagrams
 end
 show_stereotypes
 selected 
-  package_ref 129 // cinelerra3
+package_ref 129 // lumiera
 open
+  componentview_ref 128133 // interfaces
+  deploymentview_ref 128133 // EXE Deployment
   deploymentview_ref 128645 // gen
   class_ref 137477 // Unknown
   class_ref 137605 // Preview
diff --git a/uml/lumiera/DIR_INFO b/uml/lumiera/DIR_INFO
new file mode 100644
index 000000000..090f405b4
--- /dev/null
+++ b/uml/lumiera/DIR_INFO
@@ -0,0 +1 @@
+Lumiera UML model
diff --git a/uml/cinelerra3/cpp_includes b/uml/lumiera/cpp_includes
similarity index 100%
rename from uml/cinelerra3/cpp_includes
rename to uml/lumiera/cpp_includes
diff --git a/uml/cinelerra3/generation_settings b/uml/lumiera/generation_settings
similarity index 100%
rename from uml/cinelerra3/generation_settings
rename to uml/lumiera/generation_settings
diff --git a/uml/cinelerra3/idl_includes b/uml/lumiera/idl_includes
similarity index 100%
rename from uml/cinelerra3/idl_includes
rename to uml/lumiera/idl_includes
diff --git a/uml/cinelerra3/java_imports b/uml/lumiera/java_imports
similarity index 100%
rename from uml/cinelerra3/java_imports
rename to uml/lumiera/java_imports
diff --git a/uml/cinelerra3/cinelerra3.prj b/uml/lumiera/lumiera.prj
similarity index 97%
rename from uml/cinelerra3/cinelerra3.prj
rename to uml/lumiera/lumiera.prj
index 9873f26df..555a8d3ba 100644
--- a/uml/cinelerra3/cinelerra3.prj
+++ b/uml/lumiera/lumiera.prj
@@ -1,5 +1,5 @@
 format 40
-"cinelerra3"
+"lumiera"
   revision 42
   modified_by 5 "hiv"
   cpp_root_dir "../../src/"
@@ -53,8 +53,8 @@ format 40
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 "
   key "CopyrightClaim" value "
-  Copyright (C)         CinelerraCV
-    2007,               Christian Thaeter <ct@pipapo.org>
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
 
 "
   key "html dir" value "/mnt/Lager/heim/devel/cin3/doc/devel/uml/"
diff --git a/uml/cinelerra3/stereotypes b/uml/lumiera/stereotypes
similarity index 100%
rename from uml/cinelerra3/stereotypes
rename to uml/lumiera/stereotypes
diff --git a/uml/cinelerra3/tools b/uml/lumiera/tools
similarity index 100%
rename from uml/cinelerra3/tools
rename to uml/lumiera/tools
diff --git a/wiki/backend.html b/wiki/backend.html
index 6477e47ba..3cdee6a96 100644
--- a/wiki/backend.html
+++ b/wiki/backend.html
@@ -766,15 +766,15 @@ Error: #f88</pre>
 </div>
 <div title="DataBackend" modifier="CehTeh" modified="200706271504" created="200706192251" changecount="6">
 <pre>This just starts as braindump, I will refine it soon:
-* handle all files cinelerra uses at runtime (media, edl, temp data)
-* manage filehandles, cinelerra might use more more files than available filehandles
+* handle all files Lumiera uses at runtime (media, edl, temp data)
+* manage filehandles, Lumiera might use more more files than available filehandles
 * manage temporary data
 * do caching
 * io will be blocked where the backend tells the core where it can expect the data (not read()/write() like)
 * kind-of garbage collector
 * do prefetching
 * no/low latency for the core the prefetcher and other things ensure that data is available in time
-* translate any input into a format which the cinelerra core understands (demux, decode)
+* translate any input into a format which the Lumiera core understands (demux, decode)
 * same for encoding to output formats
 * offer a plugin API for encoders/decoders
 * maybe network backend for serving data to distributed render nodes
@@ -1217,7 +1217,7 @@ config.formatters.push( {
 //}}}</pre>
 </div>
 <div title="MainMenu" modifier="CehTeh" modified="200706220110" created="200706192002" changecount="5">
-<pre>''[[Cinelerra3|index.html]]''
+<pre>''[[Lumiera|index.html]]''
 DataBackend
 [[Overview]]
 &lt;&lt;fullscreen&gt;&gt;
@@ -1255,7 +1255,7 @@ When to Cache and when not to cache, aka instant [[Frame]] reuse
 </pre>
 </div>
 <div title="Overview" modifier="CehTeh" modified="200706271504" created="200706200040" changecount="12">
-<pre>Whenever cinelerra needs to access data this is done through the DataBackend described here. 
+<pre>Whenever Lumiera needs to access data this is done through the DataBackend described here. 
 
 There are two main kinds how data is handled:
 * Project Description and EDL's are handled in a InMemoryDatabase which uses a [[Serializer]] for storing and logging modifications.
diff --git a/wiki/index.html b/wiki/index.html
index 34493fc01..f2f7f8139 100755
--- a/wiki/index.html
+++ b/wiki/index.html
@@ -42,9 +42,9 @@ DAMAGE.
 <link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>
 <!--}}}-->
 
-<style type="text/css">#contentWrapper {display:none;}</style><div id="SplashScreen" style="border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;"><b>Cinelerra TiddlyWiki</b> is loading<blink> ...</blink><br><br><span style="font-size: 14px; color:red;">Requires Javascript.</span></div>
+<style type="text/css">#contentWrapper {display:none;}</style><div id="SplashScreen" style="border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;"><b>Lumiera TiddlyWiki</b> is loading<blink> ...</blink><br><br><span style="font-size: 14px; color:red;">Requires Javascript.</span></div>
 <!--PRE-HEAD-END-->
-<title> Cinelerra3 - Distributed Developer Wiki </title>
+<title> Lumiera - Distributed Developer Wiki </title>
 <style type="text/css">
 #saveTest {display:none;}
 #messageArea {display:none;}
@@ -776,15 +776,15 @@ for __Running__</pre>
 * provide central interface for setting switches and configuration options
 * installing of some or all created artifacts</pre>
 </div>
-<div title="Cinelerra3DesignProcess" modifier="MichaelPloujnikov" modified="200706270317" created="200706181202" tags="process" changecount="5">
-<pre>! Cinelerra3 design process
-A lightweight formalized process how people can add proposals for the Cinelerra3 development.
+<div title="LumieraDesignProcess" modifier="MichaelPloujnikov" modified="200706270317" created="200706181202" tags="process" changecount="5">
+<pre>! Lumiera design process
+A lightweight formalized process how people can add proposals for the Lumiera development.
 
 
 !! Description
-Use the Wiki at http://www.pipapo.org/pipawiki/Cinelerra3/DesignProcess to make it easy to add proposals in a well defined manner.
+Use the Wiki at http://www.pipapo.org/pipawiki/Lumiera/DesignProcess to make it easy to add proposals in a well defined manner.
 
-I'd like to introduce a slightly formalized process for the ongoing Cinelerra3 planning:
+I'd like to introduce a slightly formalized process for the ongoing Lumiera planning:
 * Every proposal is instantiated as 'Idea', the author gives other people the opportunity to review and comment on it with extreme prejudice, while still working out details.
 * When the the 'Idea' in a proper form and worked out in most details it becomes a 'Draft'. This 'Draft' need to be carefully reviewed, commented, perhaps corrected and rated by the other Developers.
 * At some point we may decide that a 'Draft' becomes a 'Final' (I leave it open how this decision shall be done for now). 'Final' Documents will be imported into the repository (this wiki, you are reading such a Document right now!).
@@ -813,8 +813,8 @@ This distributed wiki might be used instead the pipapo.org wiki, investigate tha
 Wiki works. It is simple to use and just flexible enough to handle the task. I don't go to install any other software for such tasks on my server. While the design progresses I'd propose to move our work into git repositories and eventually phase this wiki pages out anyways. I'd rather like to start out distributed/git right away .. but git gives us only a fine storage layer, for a design process we need some good presentation layer (later when using git and starting the implementation everyones favorite editor serves for that) I have no better ideas yet to solve the presentation problem other than using this wiki (or maybe Bouml).
 </pre>
 </div>
-<div title="Cinelerra3Wiki" modifier="Ichthyostega" modified="200708170218" created="200706172308" tags="portal" changecount="29">
-<pre>This is the entry point to several [[TiddlyWiki]]-Pages containing the developer and design documentation for Cinelrra-3.
+<div title="LumieraWiki" modifier="Ichthyostega" modified="200708170218" created="200706172308" tags="portal" changecount="29">
+<pre>This is the entry point to several [[TiddlyWiki]]-Pages containing the developer and design documentation for Lumiera.
 
 * Cehteh started GitNotes where we will collect some information about git, howto and special setups
 * since we prefer gpg signed tags in git and not each developer knows gpg well here is a Micro-GPG-HowTo 
@@ -825,7 +825,7 @@ Please __end your tiddlers in a newline__, this makes merging in git easier sinc
 
 ----
 !Design Draft
-to get started, we create design drafts emphasizing different aspects and regions of Cinelerra-3
+to get started, we create design drafts emphasizing different aspects and regions of Lumiera
 
 * Ichthyo focuses mainly on the Render Engine and its interconnection to the EDL, [[see this separate page|renderengine.html]]
 * Cehteh works on the data backend draft, see [[this page|backend.html]]
@@ -843,12 +843,12 @@ next we should //start thinking// on how to organize several aspects of the prac
 * TestSuite</pre>
 </div>
 <div title="DefaultTiddlers" modifier="CehTeh" modified="200707111115" created="200706172308" changecount="3">
-<pre>Cinelerra3Wiki
+<pre>LumieraWiki
 ShortCuts</pre>
 </div>
 <div title="DesignDocumentation" modifier="CehTeh" modified="200707030409" created="200706181207" tags="process policy" changecount="6">
-<pre>* There is a [[Manifest]] explaining the vision of the Cinelerra3 project
-* The foundation how we work together is defined in Cinelerra3DesignProcess
+<pre>* There is a [[Manifest]] explaining the vision of the Lumiera project
+* The foundation how we work together is defined in LumieraDesignProcess
 * There is a description how the git repository is set up in RepositorySetup
 * we decided to write code in GNU style, with no tabs (use spaces)
 </pre>
@@ -943,7 +943,7 @@ these two commands are used by 'admin/git-hooks/post-commit'
 <pre>some ''interesting Branches''
 
 |![[pipapo.org|PipapoOrg]]                |!''mirrored''              |!|!description                          |
-| ct#master                               | ichthyo#master            | |Cinelerra3 main development line      |
+| ct#master                               | ichthyo#master            | |Lumiera main development line         |
 | ichthyo#scons                           |                           | |[[SCons]]-based build system, improvements|
 
 </pre>
@@ -958,16 +958,16 @@ For now I hope this approach suffices, maybe we need admin/git_hooks/$HOOKNAME.$
 &amp;rarr; see [[Interesting Branches|GitBranches]]
 </pre>
 </div>
-<div title="Howto download the cinelerra3 sources and deliver changes" modifier="SimAV" modified="200707161757" created="200707152057" changecount="7">
-<pre>This part should explain what you have to do in order to download the sources of Cinelerra3 (cin3) from pipapo.org. It treats as well how to deliver improvements to cin3 using git. Git is a tool similar to cvs or svn.
+<div title="Howto download the Lumiera sources and deliver changes" modifier="SimAV" modified="200707161757" created="200707152057" changecount="7">
+<pre>This part should explain what you have to do in order to download the sources of Lumiera from pipapo.org. It treats as well how to deliver improvements to cin3 using git. Git is a tool similar to cvs or svn.
 
 The cin3 sources are stored in a git repository. Maybe you have never heard of git before, but i can allay your fears: using git isn't that complicated. To download cin3 the very first time you simply have to clone a git-repo from pipapo.org. To do so just type the following in a shell:
 !!!Code
 //{{{
-git clone git://git.pipapo.org/cinelerra3/ct YOURCOPY'sNAME
+git clone git://git.pipapo.org/lumiera/ct YOURCOPY'sNAME
 //}}}
 
-This will create a directory named YOURCOPY'sNAME which contains the whole data of the cinelerra3/ct branch of Cinelerra3. After having downloaded a cin3-git-repository you can update it by simply typing:
+This will create a directory named YOURCOPY'sNAME which contains the whole data of the lumiera/ct branch of Lumiera. After having downloaded a cin3-git-repository you can update it by simply typing:
 !!!Code
 //{{{
 cd /your/path/YOURCOPY'sNAME
@@ -978,10 +978,10 @@ If everything went well your copy is now up to date. Pulling is faster than clon
 
 !!!Tips: 
 * NEVER delete a git repository without a permission of a pro.
-* Check the url. Note e.g. the 3 in cinelerra3 
+* Check the url.
 * Install git before calling git
 
-Now you could compile the source code or improve Cinelerra3 or the documentation. After having done so (let's say you have written a patch) you can deliver your changes by:
+Now you could compile the source code or improve Lumiera or the documentation. After having done so (let's say you have written a patch) you can deliver your changes by:
 * at first setting your name and email
 * committing your changes
 * pushing your local git-repo to a public server
@@ -991,10 +991,10 @@ Now you could compile the source code or improve Cinelerra3 or the documentation
 git config --global user.name &quot;YOUR REALNAME&quot;
 git config --global user.email ~YOUR-E@MAIL.ADRESS
 git commit -m 'YOUR DESCRIPTION' -- FILE/TO/COMMIT
-git push git://git.pipapo.org/cinelerra3/mob
+git push git://git.pipapo.org/lumiera/mob
 //}}}
 
-cinelerra3/mob is an anonymous account at pipapo.org where everyone can commit changes. </pre>
+lumiera/mob is an anonymous account at pipapo.org where everyone can commit changes. </pre>
 </div>
 <div title="IRC-Transcripts" modifier="Ichthyostega" modified="200802021818" created="200708120209" tags="discuss irclog" changecount="7">
 <pre>We keep a protocol or short summary of each important discussion. The summaries of the monthly developer meetings are posted to the Mailinglist and can be found on pipapo.org too
@@ -1046,8 +1046,8 @@ cinelerra3/mob is an anonymous account at pipapo.org where everyone can commit c
 * Plouj
 * Velmont
 
-!! Discuss the open points in http://www.pipapo.org/pipawiki/Cinelerra3/DesignProcess &amp;mdash; do we need this formalism?
-At start of the project last summer, Cehteh made a [[design process proposal|http://www.pipapo.org/pipawiki/Cinelerra3/DesignProcess]]. We will keeping this up, not for every implementation detail, but for major plans, wishes and design decisions. One point in the agenda of future meetings will be to work through proposals in the queue
+!! Discuss the open points in http://www.pipapo.org/pipawiki/Lumiera/DesignProcess &amp;mdash; do we need this formalism?
+At start of the project last summer, Cehteh made a [[design process proposal|http://www.pipapo.org/pipawiki/Lumiera/DesignProcess]]. We will keeping this up, not for every implementation detail, but for major plans, wishes and design decisions. One point in the agenda of future meetings will be to work through proposals in the queue
 * proposals in the &quot;idea&quot; state are not complete, can be just brainstorming or need further discussion. Comments please to the proposal page.
 * proposals in the &quot;draft&quot; state are ready for conclusive discussion and will be treated in one of the next meetings
 * &quot;final&quot; proposals are either &quot;accepted&quot; or &quot;dropped&quot;. We don't differentiate the latter, but should write a short note why it was dropped.
@@ -1068,7 +1068,7 @@ We plan to make the discussion about GPL v3 a point on the agenda of the next me
 * write a short status report for each mayor part //prior// to the meeting (saves us time). Maybe add an TODO list there
 * go through the open issues for the design process drafts
 * publish a protocol of each meeting on the (~Cinelerra-CV, ~LibOpenvideo) Mailinglists, in the TiddlyWiki and on pipapo.org
-* News, Protocols and the agenda of the next meeting can be found at the [[pipawiki-page|http://www.pipapo.org/pipawiki/Cinelerra3/MonthlyMeetings]]
+* News, Protocols and the agenda of the next meeting can be found at the [[pipawiki-page|http://www.pipapo.org/pipawiki/Lumiera/MonthlyMeetings]]
 * next meeting on first Thursday in March (6.3.2008)
 
 !! Who works on what, what are the short term goals, what tasks are open?
@@ -1086,7 +1086,7 @@ Things to do: object serialisation backend is sometime on Cehteh's schedule, but
 __about multithreading__: since the render nodes are stateless they can be driven in multiple threads (but inter frame dependencies need to be resolved/serialized). Mostly the backend manages threads and does that quite conservatively (compared to Cinelerra-2 which massively creates separate threads for small tasks). Any edit operations initiated from GUI go to a scheduler in the middle layer, which enqueues and effectively serializes operations done to the &quot;media objects&quot; in the high-level model. The editing operations themselves are //not threadsafe // by design, they rely on being scheduled correctly. The builder is triggered from this ~Proc-Layer scheduler and starts in one separate thread, and when done, we swap whole parts of the render nodes network and then the backend can re(start) rendering as needed.
 
 !!The naming discussion
-The discussion looks healthy so far... People can add new proposals on the [[pipawiki|http://www.pipapo.org/pipawiki/Cinelerra3/Names]]. intersting names are still coming in, so we should just let the name-choosing game go on for a while. And, btw, we //can// depart from beeing similar to &quot;Cinelerra&quot; ;-) 
+The discussion looks healthy so far... People can add new proposals on the [[pipawiki|http://www.pipapo.org/pipawiki/Lumiera/Names]]. intersting names are still coming in, so we should just let the name-choosing game go on for a while. And, btw, we //can// depart from beeing similar to &quot;Cinelerra&quot; ;-) 
 Let's say, we need a person volonteering to guide/moderate the selection, going over the list and scratching inammprobiate ones. Criteria for good names being:
 * should not be an existing project
 * should be &quot;googleable&quot;
@@ -1409,7 +1409,7 @@ config.formatters.push( {
 </div>
 <div title="MainMenu" modifier="CehTeh" modified="200707111114" created="200706172305" changecount="4">
 <pre>GettingStarted
-[[Cinelerra3Wiki]]
+[[LumieraWiki]]
 [[Backend|backend.html]]
 [[Proc-Layer|renderengine.html]]
 [[Support-Library|support_library.html]]
@@ -1418,7 +1418,7 @@ config.formatters.push( {
 </div>
 <div title="Manifest" modifier="MichaelPloujnikov" modified="200706270308" created="200706181209" changecount="9">
 <pre>! Manifest
-This Proposal describe the general ideas how the community will work together to create Cinelerra3.
+This Proposal describe the general ideas how the community will work together to create Lumiera.
 
 !! Description
 I started with my personal opinions, so far people expressed their commitment with this text.
@@ -1432,11 +1432,11 @@ Some of these things work quite well, there is an overall friendly relation betw
 
 But there are some bad things too. Notably there is not much progress on the community development. Users don't benefit from new improvements which other people have made. There is a endlessly growing list of bugs and feature requests, when someone sends a patch to the ML he has to invest quite some time to maintain it until it might be merged. Finally we don't know what heroine virtual is working on, until we see his next tarball.
 
-!! Solution for Cinelerra3
+!! Solution for "Cinelerra3" / Lumiera
 Cinelerra is heroine's product, this time we should work together with him to make it pleasant and progressing for anyone.
 We are in need of a new development model which is acceptable by all involved people and benefits from the way Cinelerra development worked the years before, without maintaining the bad sides again: 
 
-# ''Make it easy to contribute''&lt;&lt;br&gt;&gt;Even if it is favorable when we have people which are continuously working on Cinelerra, it's a fact that people show up, send a few patches and then disappear. The development model should be prepared for this by:
+# ''Make it easy to contribute''&lt;&lt;br&gt;&gt;Even if it is favorable when we have people which are continuously working on Lumiera / Cinelerra, it's a fact that people show up, send a few patches and then disappear. The development model should be prepared for this by:
 ## Good documentation
 ## Well defined design and interfaces  
 ## Establish some coding guidelines to make it easy for others maintain code written by others
@@ -1444,8 +1444,8 @@ We are in need of a new development model which is acceptable by all involved pe
 # ''Simple access''&lt;&lt;br&gt;&gt;We will use a fully distributed development model using git. I'll open a anonymous pushable repository which anyone can use to publish his changes.
 # ''Freedom to do, or not to do''&lt;&lt;br&gt;&gt;The model allows everyone to do as much as he wants. In a free project there is no way to put demands on people. This is good since it's easy to join and is open for anyone. The community might expect some responsibility for people maintaining their patches, but at worst, things which don't match our expected quality and when there is no one who keeps them up, will be removed. Since we are working in a distributed way with each developer maintaining his own repository and merging from other people, there is no easy way that bad code will leap into the project.
 # ''No Rule is better than a Rule which is not engaged''&lt;&lt;br&gt;&gt;We have to agree on some rules to make teamwork possible. These rules should be kept to a minimum required and accepted by all involved people. It is vital that we can trust each other on simple things, like properly formatted code or that patches one proposes to merge don't break the system etc..
-# ''Legal status must be clear''&lt;&lt;br&gt;&gt;Cinelerra is developed under the GPL, every contributor must acknowledge this. Even when we provide anonymous commits, every non trivial patch should be traceable to the person who made it, GPG signatures would be proper here - details need to be worked out.
-# ''All for Cinelerra''&lt;&lt;br&gt;&gt;The goal is to make the best Linux video editor to date, nothing less. Everyone puts in their best abilities. This project is not the place to blame people for things where they are not profound, help each other, make things right instead of blaming someone. Everyone should rate himself at what he can do best on the project.
+# ''Legal status must be clear''&lt;&lt;br&gt;&gt;Lumiera is developed under the GPL, every contributor must acknowledge this. Even when we provide anonymous commits, every non trivial patch should be traceable to the person who made it, GPG signatures would be proper here - details need to be worked out.
+# ''All for Lumiera''&lt;&lt;br&gt;&gt;The goal is to make the best Linux video editor to date, nothing less. Everyone puts in their best abilities. This project is not the place to blame people for things where they are not profound, help each other, make things right instead of blaming someone. Everyone should rate himself at what he can do best on the project.
 </pre>
 </div>
 <div title="MarkupPreHead" modifier="Ichthyostega" modified="200708120049" created="200706172303" tags="excludeMissing" changecount="2">
@@ -1453,7 +1453,7 @@ We are in need of a new development model which is acceptable by all involved pe
 &lt;link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/&gt;
 &lt;!--}}}--&gt;
 
-&lt;style type=&quot;text/css&quot;&gt;#contentWrapper {display:none;}&lt;/style&gt;&lt;div id=&quot;SplashScreen&quot; style=&quot;border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;&quot;&gt;&lt;b&gt;Cinelerra TiddlyWiki&lt;/b&gt; is loading&lt;blink&gt; ...&lt;/blink&gt;&lt;br&gt;&lt;br&gt;&lt;span style=&quot;font-size: 14px; color:red;&quot;&gt;Requires Javascript.&lt;/span&gt;&lt;/div&gt;</pre>
+&lt;style type=&quot;text/css&quot;&gt;#contentWrapper {display:none;}&lt;/style&gt;&lt;div id=&quot;SplashScreen&quot; style=&quot;border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;&quot;&gt;&lt;b&gt;Lumiera TiddlyWiki&lt;/b&gt; is loading&lt;blink&gt; ...&lt;/blink&gt;&lt;br&gt;&lt;br&gt;&lt;span style=&quot;font-size: 14px; color:red;&quot;&gt;Requires Javascript.&lt;/span&gt;&lt;/div&gt;</pre>
 </div>
 <div title="Micro-GPG-HowTo" modifier="CehTeh" modified="200708101901" created="200708101900" changecount="2">
 <pre>I (cehteh) just paste my configs and give very few hints here, refer to the gpg manpage, the gpg documentation, google or ask on IRC for details. Maybe you improve this.
@@ -2324,7 +2324,7 @@ Here we describe the Directory hierarchy and how the git repository are set up.
 !! Description
 Use &quot;./admin/treeinfo.sh&quot; to produce a annotated directory tree like this:
 {{{
-.                                       : The root dir for the cinelerra3 project
+.                                       : The root dir for the Lumiera project
 ./admin                                 : administrative scripts
 ./admin/git_hooks                       : git hook scripts
 ./build                                 : build dir
@@ -2332,12 +2332,12 @@ Use &quot;./admin/treeinfo.sh&quot; to produce a annotated directory tree like t
 ./doc/devel                             : developer documentation, extra sources, doxygen
 ./doc/devel/uml                         : Bouml generated HTML doc
 ./doc/user                              : user documentation in texinfo
-./oldsrc                                : cinelerra2 sources, added per case when needed
+./oldsrc                                : Cinelerra2 sources, added per case when needed
 ./src                                   : every components source in a own subdir here
 ./tests                                 : test suite
 ./tests/bugs                            : tests against reported bugs
 ./uml                                   : uml models, created with bouml
-./uml/cinelerra3                        : cinelerra3 UML model
+./uml/lumiera                           : Lumiera UML model
 ./wiki                                  : tiddlywiki for semi-persistent documentation
 }}}
 
@@ -2412,7 +2412,7 @@ I made this proposal 'final' now further details are likely better worked out in
 <div title="SCons" modifier="Ichthyostega" modified="200708180224" created="200708180211" tags="organization buildsys" changecount="3">
 <pre>[SCons|http://www.scons.org/] is an //alternate build system// written in Python and using specific python-scripts for defining the buildprocess. These build scripts, called {{{SConstruct}}} and {{{SConsscript}}} are indeed //definitions//, not scripts for //doing// the build. If you are new to SCons (and familiar with make), you should really read the [Introduction of the users guide|http://www.scons.org/doc/0.97/HTML/scons-user/book1.html], because SCons is quite a different beast then make and the autotools.
 
-To learn how to use SCons and to get a better feeling of its strenghtes and weaknesses, Ichthyo started a SCons based build system for cinelerra in July 2007 and will maintain it for some time parallel to the automake system (maintained by Cehteh). Every build system looks good in theory and has some big advantages, but only in real use one can see how much effort is needed to keep up with the demands of a given project.
+To learn how to use SCons and to get a better feeling of its strenghtes and weaknesses, Ichthyo started a SCons based build system for Lumiera in July 2007 and will maintain it for some time parallel to the automake system (maintained by Cehteh). Every build system looks good in theory and has some big advantages, but only in real use one can see how much effort is needed to keep up with the demands of a given project.
 
 !some Notes
 * we build always in the top level directory
@@ -2426,7 +2426,7 @@ To learn how to use SCons and to get a better feeling of its strenghtes and weak
 ** check == directory {{{tests}}} and runs the testsuite
 * run scons -h to get additional explanations.
 
-Typically, one would just write the necessary definitions as they come into one global scope. But because the buildscripts are actually Python scripts, ichthyo found it preferable to use some more structuring and break down the code into several python functions and pass all necessary variables as parameters. This may seem overkill at first look, but the cinelerra project is expected to become a large project.
+Typically, one would just write the necessary definitions as they come into one global scope. But because the buildscripts are actually Python scripts, ichthyo found it preferable to use some more structuring and break down the code into several python functions and pass all necessary variables as parameters. This may seem overkill at first look, but the Lumiera project is expected to become a large project.
 
 Moreover, one could simply list all needed files or break everything down into a hierarchical build. But instead, we use for most objects a helper function (located in {{{admin/scons/Buildhelper.py}}}) called {{{srcSubtree()}}}, which will scan a directory tree and add all {{{'*.c','*.cpp','*.cc'}}} - files as Object nodes to the build process. Besides that, we use the //hierarchical aproach rather reluctant//: at the moment, only the subtree for separate tools and the tests-directory have a separate buildscript. Probably, the subtree for plugins will get one as well at some point in the future.
 </pre>
@@ -2446,7 +2446,7 @@ Moreover, one could simply list all needed files or break everything down into a
 <pre>Distributed Developer Wiki</pre>
 </div>
 <div title="SiteTitle" modifier="CehTeh" created="200706181110" changecount="1">
-<pre>Cinelerra3</pre>
+<pre>Lumiera</pre>
 </div>
 <div title="SplashScreenPlugin" modifier="Saq" modified="200607202048" created="200607191631" tags="lewcidExtension systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200607202048">
 <pre>/***
@@ -3686,7 +3686,7 @@ to help with automating the build, ichthyo would appreciate to have the followin
 ** the testdefinitions together with {{{test.sh}}}
 ** the test-executables, which should named according to the pattern {{{test-XXX}}}
 * below are the source directories for each of the aforementioned test-executables. When such a source directory is named &quot;XXX&quot;, the corresponding executable is &quot;test-XXX&quot;
-* each of the source directories, which actually could be source trees, will be compiled and linked together with the cinelerra core classes and files. Thus, it needs to contain exactly //one// main(), but by using commandline parameters, one executable can drive a lot of different tests.
+* each of the source directories, which actually could be source trees, will be compiled and linked together with the Lumiera core classes and files. Thus, it needs to contain exactly //one// main(), but by using commandline parameters, one executable can drive a lot of different tests.
 
 -------
 //as of 18.8.2007, ichthyo has implemented this scheme for the SCons build//
@@ -3821,7 +3821,7 @@ function addKeyDownHandlers(e)
 </div>
 <div title="TiddlyWiki" modifier="Ichthyostega" modified="200708120058" created="200706260506" tags="excludeMissing" changecount="4">
 <pre>The Name of the Software driving this Wiki. Is is written completely in ~JavaScript and contained in one single HTML page.
-Thus no server and no network connection is needed. Simply open the file in your browser and save changes locally. As the wiki HTML is located in the Cinelerra source tree, all changes will be managed and distributed via [[GIT|GitNotes]]. While doing so, you sometimes will have to merge conflicing changes manually in the HTML source. There is a 'empty.html' in the same folder serving as template for generating new wikis. Please refrain from editing it.
+Thus no server and no network connection is needed. Simply open the file in your browser and save changes locally. As the wiki HTML is located in the Lumiera source tree, all changes will be managed and distributed via [[GIT|GitNotes]]. While doing so, you sometimes will have to merge conflicing changes manually in the HTML source. There is a 'empty.html' in the same folder serving as template for generating new wikis. Please refrain from editing it.
  * see GettingStarted
  * see [[Homepage|http://tiddlywiki.com]], [[Wiki-Markup|http://tiddlywiki.com/#MainFeatures]]
 </pre>
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 5bc243c00..b36e6e2d3 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -524,13 +524,13 @@ We can distinguish several different Kinds of Assets, each one with specific pro
 [img[Asset Classess|uml/fig130309.png]]
 
 !Media Asset
-Some piece of Media Data accessible at some external Location and able to be processed by Cinelerra. A Media File on Harddisk can be considered as the most basic form of Media Asset, with some important derived flavours, like a Placeholder for a currently unavailable Source, or Media available in different Resolutions or Formats.
+Some piece of Media Data accessible at some external Location and able to be processed by Lumiera. A Media File on Harddisk can be considered as the most basic form of Media Asset, with some important derived flavours, like a Placeholder for a currently unavailable Source, or Media available in different Resolutions or Formats.
 * __outward interface operations__ include querying properties, creating an Clip MObject, controlling processing policy (low res proxy placeholders, interlacing and other generic pre- and postprocessing)
 * __inward interface operations__ include querying filename, codec, offset and any other informations necessary for creating a source render node, getting additional processing policy decisions (handling of interlacing, aspect ratio).
 &amp;rarr; MediaAsset
 
 !Processing Asset
-Some software component able to work on media data in the Cinelerra Render engine Framework. This includes all sorts of loadable effects, as well as some of the standard, internal facilities (Mask, Projector). Note that Processing Assets typically provide some attachment Point or means of communication with GUI facilities.
+Some software component able to work on media data in the Lumiera Render engine Framework. This includes all sorts of loadable effects, as well as some of the standard, internal facilities (Mask, Projector). Note that Processing Assets typically provide some attachment Point or means of communication with GUI facilities.
 * __outward interface operations__ include...
 * __inward interface operations__ include...
 &amp;rarr; ProcAsset {{red{to be defined}}}
@@ -798,7 +798,7 @@ Error: #f88</pre>
 </pre>
 </div>
 <div title="ConfigRules" modifier="Ichthyostega" modified="200802130339" created="200801171352" tags="overview spec" changecount="8">
-<pre>Many features can be implemented by specifically configuring and wiring some unspecific components. Rather than tie the client code in need of some given feature to these configuration internals, in Cinelerra-3 the client can //query // for some kind of object providing the //needed capabilities. // Right from start (summer 2007), Ichthyo had the intention to implement such a feature using sort of a ''declarative database'', e.g. by embedding a Prolog system. By adding rules to the basic session configuration, users should be able to customize the semi-automatic part of Cinelerra's behaviour to great extent.
+<pre>Many features can be implemented by specifically configuring and wiring some unspecific components. Rather than tie the client code in need of some given feature to these configuration internals, in Lumiera the client can //query // for some kind of object providing the //needed capabilities. // Right from start (summer 2007), Ichthyo had the intention to implement such a feature using sort of a ''declarative database'', e.g. by embedding a Prolog system. By adding rules to the basic session configuration, users should be able to customize the semi-automatic part of Lumiera's behaviour to great extent.
 
 [[Configuration Queries|ConfigQuery]] are used at various places, when creating and adding new objects, as well when building or optimizing the render engine node network.
 * Creating a [[pipe|PipeHandling]] queries for a default pipe or a pipe with a certain stream type
@@ -886,7 +886,7 @@ Another pertinent theme is to make the basic building blocks simpler, while on t
 <div title="EDL" modifier="Ichthyostega" modified="200712100537" created="200706210610" tags="def" changecount="8">
 <pre>''EDL'' is a short-hand for __E__dit __D__ecision __L__ist. The use of this term can be confusing; for the usual meaning see the definition in [[Wikipedia|http://en.wikipedia.org/wiki/Edit_decision_list]]
 
-Cinelerra uses this term in a related manner but with a somewhat shifted focus (and we just stick to this usage here): In Cinelerra the EDL is comprised of the whole set of clips and other media objects parametrized and placed onto the tracks by the user. It is the result of the user's //editing efforts.//
+Cinelerra uses this term in a related manner but with a somewhat shifted focus (and we just stick to this usage here): In Lumiera the EDL is comprised of the whole set of clips and other media objects parametrized and placed onto the tracks by the user. It is the result of the user's //editing efforts.//
 
 In this usage, the EDL in most cases will be almost synonymous to the [[Session|SessionOverview]], just the latter emphasizes more the state aspect, as it can be thought as the current EDL contents contained in a file or data structure together with additional Option values and settings for the GUI. The Session is what you save and load, while the EDL rather denotes a structured collection of Objects placed in time.
 
@@ -988,7 +988,7 @@ For this reason I make Factory a Functor, and for handling the concrete memory a
       int uii ;
 
     public:
-      typedef cinelerra::factory::RefcountPtr&lt;Blubb&gt; Factory;
+      typedef lumiera::factory::RefcountPtr&lt;Blubb&gt; Factory;
       static Factory create;
       
       Blubb() : uii(42) {} ;
@@ -1106,13 +1106,13 @@ Slider.prototype.stop = function()
 <div title="GOPs" modifier="Ichthyostega" modified="200706220333" created="200706220301" tags="def" changecount="2">
 <pre>__G__roup __of__ __P__ictures: several compressed video formats don't encode single frames. Normally, such formats are considered mere //delivery formates// but it was one of the key strenghts of Cinelrra from start to be able to do real non linear editing on such formats (like the ~MPEG2-ts unsed in HDV video). The problem of course is that the data backend needs to decode the whole GOP to be serve  single raw video frames.
 
-For this Cinelerra3 design, we could consider making GOP just another raw media data frame type and integrate this decoding into the render pipeline, similar to an effect based on several source frames for every calculated output frame.
+For this Lumiera design, we could consider making GOP just another raw media data frame type and integrate this decoding into the render pipeline, similar to an effect based on several source frames for every calculated output frame.
 
 &amp;rarr;see in [[Wikipedia|http://en.wikipedia.org/wiki/Group_of_pictures]]
 </pre>
 </div>
 <div title="ImplementationDetails" modifier="Ichthyostega" modified="200802031829" created="200708080322" tags="overview" changecount="21">
-<pre>This wiki page is the entry point to detail notes covering some technical decisions, details and problems encountered in the course of the implementation of the Cinelerra Renderengine, the Builder and the related parts.
+<pre>This wiki page is the entry point to detail notes covering some technical decisions, details and problems encountered in the course of the implementation of the Lumiera Renderengine, the Builder and the related parts.
 
 * [[Packages, Interfaces and Namespaces|InterfaceNamespaces]]
 * [[Memory Management Issues|MemoryManagement]]
@@ -1132,7 +1132,7 @@ For this Cinelerra3 design, we could consider making GOP just another raw media
 <div title="ImplementationGuidelines" modifier="Ichthyostega" modified="200711210542" created="200711210531" tags="discuss draft" changecount="7">
 <pre>!Observations, Ideas, Proposals
 ''this page is a scrapbook for collecting ideas'' &amp;mdash; please don't take anything noted here too literal. While writing code, I observe that I (ichthyo) follow certain informal guidelines, some of which I'd like to note down because they could evolve into general style guidelines for the proc layer code.
-* avoid doing anything non-local during the startup phase or shutdown phase of the application. consequently, allways prefer using an explicit cinelerra::Singleton&lt;T&gt; over using an static instance directly, thus yielding better control when the ctor and dtor will be invoked.
+* avoid doing anything non-local during the startup phase or shutdown phase of the application. consequently, allways prefer using an explicit lumiera::Singleton&lt;T&gt; over using an static instance directly, thus yielding better control when the ctor and dtor will be invoked.
 * write error handling code only if the error situation can be actually //handled// at this place. Otherwise, be prepared for exceptions just passing by and thus handle any resources by &quot;resource acquisition is initialisation&quot;. Remember: error handling defeats decoupling and encapsulation
 * (almost) never {{{delete}}} an object directly, use {{{new}}} only when some smart pointer is at hand.
 * when user/client code is inteded to create objects, make the ctor protected and provide a factory member called {{{create}}} instead, returning a smart pointer
@@ -1458,7 +1458,7 @@ config.formatters.push( {
 # surely there will be the need to use some macros (albeit code written in C++ can successfully avoid macros to some extent)
 # there will be one global ''Application State'' representation (and some application services)
 # we have some lib facilities, especially a common [[Time]] abstraction
-For these we have one special (bilingual) header file __cinelerra.h__, which places in its C++ part some declarations into __namespace cinelerra__. These declarations should be pulled into the specific namespaces or (still better) into the implementation //on demand//. There is no nesting (we deliberately don't want an symbol appearing //automatically// in every part of the system).
+For these we have one special (bilingual) header file __lumiera.h__, which places in its C++ part some declarations into __namespace lumiera__. These declarations should be pulled into the specific namespaces or (still better) into the implementation //on demand//. There is no nesting (we deliberately don't want an symbol appearing //automatically// in every part of the system).
 
 !subsystem interface and facade
 These large scale interfaces reside in special namespaces &quot;~XXX_interface&quot; (where XXX is the subsystem). The accompanning //definitions// depend on the implementation namespace and are placed in the top-level source folder of the corresponding subsystem.
@@ -1484,7 +1484,7 @@ From experiences with other middle scale projects, I prefer having the test code
 </pre>
 </div>
 <div title="Loading Media" modifier="Ichthyostega" modified="200712100630" created="200709220005" tags="design spec" changecount="4">
-<pre>Opening and accessing media files on disk poses several problems, most of which belong to the domain of cinelerra's data backend. Here, we focus on the questions related to making media data available to the EDL and the render engine. Each media will be represented by an MediaAsset object, which indeed could be a compound object (in case of MultichannelMedia). Building this asset object thus includes getting informations from the real file on disk. For delegating this to the backend, we use the following query interface:
+<pre>Opening and accessing media files on disk poses several problems, most of which belong to the domain of Lumiera's data backend. Here, we focus on the questions related to making media data available to the EDL and the render engine. Each media will be represented by an MediaAsset object, which indeed could be a compound object (in case of MultichannelMedia). Building this asset object thus includes getting informations from the real file on disk. For delegating this to the backend, we use the following query interface:
 * {{{queryFile(char* name)}}} requests accessing the file and yields some (opaque) handle when successful.
 * {{{queryChannel(fHandle, int)}}} will then be issued in sequence with ascending index numbers, until it returns {{{NULL}}}.
 * the returned struct (pointer) will provide the following information:
@@ -1527,7 +1527,7 @@ This Design strives to achieve a StrongSeparation between the low-level Structur
 </pre>
 </div>
 <div title="MainMenu" modifier="Ichthyostega" modified="200802031758" created="200706172305" changecount="10">
-<pre>''[[Cinelerra3|index.html]]''
+<pre>''[[Lumiera|index.html]]''
 [[Proc-Layer|ProcLayer and Engine]]
 [[MObjects]]
 [[Implementation|ImplementationDetails]]
@@ -1566,7 +1566,7 @@ This Design strives to achieve a StrongSeparation between the low-level Structur
 </pre>
 </div>
 <div title="MemoryManagement" modifier="Ichthyostega" modified="200711180014" created="200708100225" tags="impl decision discuss" changecount="12">
-<pre>Of course: Cinelerra currently leaks memory and crashes regularilly. For the newly written code, besides retaining the same performance level, a main goal is to use methods and techniques known to support the writing of quality code. So, besides the MultithreadConsiderations, a solid strategy for managing the ownership of allocated memory blocks is necessary right from start.
+<pre>Of course: Cinelerra currently leaks memory and crashes regularilly. For the newly written code, besides retaining the same level of performance, a main goal is to use methods and techniques known to support the writing of quality code. So, besides the MultithreadConsiderations, a solid strategy for managing the ownership of allocated memory blocks is necessary right from start.
 
 !Problems
 # Memory management needs to work correct in a //fault tolerant environment//. That means that we need to be prepared to //handle on a non-local scale// some sorts of error conditions (without aborting the application). To be more precise: some error condition arises locally, which leads to a local abort and just the disabling/failing of some subsystem without affecting the application as a whole. This can happen on a regular base (e.g. rendering fails) and thus is __no excuse for leaking memory__
@@ -1663,7 +1663,7 @@ My proposed aproach is to treat OpenGL as a separate video raw data type, requir
 </pre>
 </div>
 <div title="Overview" modifier="Ichthyostega" modified="200711122342" created="200706190300" tags="overview" changecount="6">
-<pre>The Cinelerra-3 Processing Layer is comprised of various subsystems and can be separated into a low-level and a high-level part. At the low-level end is the [[Render Engine|OverviewRenderEngine]] which basically is a network of render nodes cooperating closely with the Backend Layer in order to carry out the actual playback and media transforming calculations. Whereas on the high-level side we find several different [[Media Objects|MObjects]] that can be placed into the [[EDL]], edited and manipulated. This is complemented by the [[Asset Management|Asset]], which is the &quot;bookkeeping view&quot; of all the different &quot;things&quot; within each [[Session|SessionOverview]].
+<pre>The Lumiera Processing Layer is comprised of various subsystems and can be separated into a low-level and a high-level part. At the low-level end is the [[Render Engine|OverviewRenderEngine]] which basically is a network of render nodes cooperating closely with the Backend Layer in order to carry out the actual playback and media transforming calculations. Whereas on the high-level side we find several different [[Media Objects|MObjects]] that can be placed into the [[EDL]], edited and manipulated. This is complemented by the [[Asset Management|Asset]], which is the &quot;bookkeeping view&quot; of all the different &quot;things&quot; within each [[Session|SessionOverview]].
 [img[Block Diagram|uml/fig128005.png]]
 </pre>
 </div>
@@ -2416,12 +2416,12 @@ We need to work out guidelines for dealing with operations going on simultaneous
 </pre>
 </div>
 <div title="Proc-Layer" modifier="Ichthyostega" created="200802031814" tags="def" changecount="1">
-<pre>The current Cinelerra-3 architecture separates functionality into three Layers: __GUI__, __Proc__ and __Backend__.
+<pre>The current Lumiera architecture separates functionality into three Layers: __GUI__, __Proc__ and __Backend__.
 
 While the Backend is responsible for Data access and management and for carrying out the computation intensive media opteratons, the middle Layer or ~Proc-Layer contains [[assets|Asset]] and [[Session]], i.e. the user-visible data model and provides configuration and behaviour for these entities. Besides, he is responsible for [[building and configuring|Builder]] the [[render engine|RenderEngine]] based on the current Session state.</pre>
 </div>
 <div title="ProcAsset" modifier="Ichthyostega" created="200709221343" tags="def classes" changecount="1">
-<pre>All Assets of kind asset::Proc represent //processing algorithms// in the bookkeeping view. They enable loading, browsing and maybe even parametrizing all the Effects, Plugins and Codecs available for use within the Cinelerra Session.
+<pre>All Assets of kind asset::Proc represent //processing algorithms// in the bookkeeping view. They enable loading, browsing and maybe even parametrizing all the Effects, Plugins and Codecs available for use within the Lumiera Session.
 
 Besides, they provide an important __inward interface__ for the [[ProcNode]]s, which will use these asset entries to dispatch the actual processing call when rendering. 
 
@@ -2503,7 +2503,7 @@ Then, running the goal {{{:-retrieve(T, stream(T,mpeg)).}}} would search a Track
 * Any __participating object kind__ needs a way to declare domain specific predicates, thus triggering the registration of the necessary hooks within the supporting system. Moreover, it should be able to inject further prolog code (as shown in the example above with the {{{strem(T, mpeg)}}} predicate. For each of these new domain specific predicates, there needs to be a functor which can be invoked when the C implementation of the predicate is called from Prolog (in some cases even later, when the final solution is &quot;executed&quot;, e.g. a new instance has been created and now some properties need to be set).
 
 !!a note on Plugins
-In the design of the Cinelerra-3 Proc Layer done thus far, we provide //no possibility to introduce a new object kind// into the system via plugin interface. The system uses a fixed collection of classes intended to cover all needs (Clip, Effect, Track, Pipe, Label, Automation, ~Macro-Clips). Thus, plugins will only be able to provide new parametrisations of existing classes. This should not be any real limitation, because the whole system is designed to achieve most of its functionality by freely combining rather basic object kinds. As a plus, it plays nicely with any plain-C based plugin interface. For example, we will have C++ adapter classes for the most common sorts of effect plugin (pull system and synchronous frame-by-frame push with buffering) with a thin C adaptation layer for the specific external plugin systems used. Everything beyond this point can be considered &quot;condiguration data&quot; (including the actual plugin implementation to be loaded)
+In the design of the Lumiera Proc Layer done thus far, we provide //no possibility to introduce a new object kind// into the system via plugin interface. The system uses a fixed collection of classes intended to cover all needs (Clip, Effect, Track, Pipe, Label, Automation, ~Macro-Clips). Thus, plugins will only be able to provide new parametrisations of existing classes. This should not be any real limitation, because the whole system is designed to achieve most of its functionality by freely combining rather basic object kinds. As a plus, it plays nicely with any plain-C based plugin interface. For example, we will have C++ adapter classes for the most common sorts of effect plugin (pull system and synchronous frame-by-frame push with buffering) with a thin C adaptation layer for the specific external plugin systems used. Everything beyond this point can be considered &quot;condiguration data&quot; (including the actual plugin implementation to be loaded)
 </pre>
 </div>
 <div title="RSSReaderPlugin" modifier="Ichthyostega" created="200708081515" tags="systemConfig" changecount="1">
@@ -2767,7 +2767,7 @@ The Session object is a singleton &amp;mdash; actually it is a »~PImpl«-Facade
 <pre>The [[Session]] (sometimes also called //Project//) contains all informations and objects to be edited by the User. It can be saved and loaded. The individual Objects within the Session, i.e. Clips, Media, Effects, are contained in one (or several) collections within the Session, which we call [[EDL (Edit Decision List)|EDL]]. Moreover, the sesion contains references to all the Media files used, and it contains various default or user defined configuration, all being represented as [[Asset]]. At any given time, there is //only one current session// opened within the application.
 
 !!!larger projects
-For larger editing projects the simple structure of a session containing &quot;the&quot; timeline is not sufficient. Rather, we have several timelines, e.g. one for each scene. Or we could have several layered or nested timelines (compositional work, multimedia productions). To support these cases without making the default case more complicated, Cinelerra-3 introduces a //focus// for selecting the //current EDL,// which will receive all editing operations.
+For larger editing projects the simple structure of a session containing &quot;the&quot; timeline is not sufficient. Rather, we have several timelines, e.g. one for each scene. Or we could have several layered or nested timelines (compositional work, multimedia productions). To support these cases without making the default case more complicated, Lumiera introduces a //focus// for selecting the //current EDL,// which will receive all editing operations.
 
 !!!the definitive state
 With all the structural complexities possible within such a session, we need an isolation layer to provide __one__ definitive state where all configuration has been made explicit. Thus the session manages one special object list, the [[Fixture]], which can be seen as all currently active objects placed onto a single timeline.
@@ -4142,7 +4142,7 @@ A good starting point for understanding our library implementation of the visito
 &amp;rarr; [[implementation deatails|VisitingToolImpl]]
 
 !why bothering with visitor?
-In the Cinelerra-3 Proc layer, Ichthyo uses the visitor pattern to overcome another notorious problem when dealing with more complex class hierarchies: either, the //interface// (root class) is so unspecific to be almost useless, or, in spite of having a useful contract, this contract will effectively be broken by some subclasses (&quot;problem of elliptical circles&quot;). Initially, when designing the classes, the problems aren't there (obviously, because they could be taken as design flaws). But then, under the pressure of real features, new types are added later on, which //need to be in this hierarchy// and at the same time //need to have this and that special behaviour// and here we go ...
+In the Lumiera Proc layer, Ichthyo uses the visitor pattern to overcome another notorious problem when dealing with more complex class hierarchies: either, the //interface// (root class) is so unspecific to be almost useless, or, in spite of having a useful contract, this contract will effectively be broken by some subclasses (&quot;problem of elliptical circles&quot;). Initially, when designing the classes, the problems aren't there (obviously, because they could be taken as design flaws). But then, under the pressure of real features, new types are added later on, which //need to be in this hierarchy// and at the same time //need to have this and that special behaviour// and here we go ...
 Visitor helps us to circumvent this trap: the basic operations can be written against the top level interface, such, that they include visiting some object collection internally. Now, on a case-by-case base, local operations can utilize some sub interface or the given concrete type's public interface. So visitor helps to encapsulate cooperating specific technical details within some concrete visiting tool implementation, while forcing them to be implemented against some interface or sub-interface of the target objects.
 
 !!well suited for using visitors
diff --git a/wiki/support_library.html b/wiki/support_library.html
index efc4009dc..095ca833f 100644
--- a/wiki/support_library.html
+++ b/wiki/support_library.html
@@ -671,7 +671,7 @@ API:
 
 {{{
 const char*
-cinelerra_error_set (const char * err)
+lumiera_error_set (const char * err)
 }}}
 
 if there is no error pending, then store err as new error state, if there was an error pending, then the state is not altered.
@@ -680,30 +680,30 @@ return the former state (NULL if err got set, some other when an error is pendin
 
 {{{
 const char*
-cinelerra_error ()
+lumiera_error ()
 }}}
 
 returns the error state ''and'' clears it. The user has to store it temporary when need to be used further. Rationale: less TLS access overhead, never forget to clear the state.
 
-(do we need a {{{cinelerra_error_peek()}}}?)
+(do we need a {{{lumiera_error_peek()}}}?)
 
 Declaration and definition:
 {{{
-#define CINELERRA_ERROR_DECLARE(err) \
-extern const char* CINELERRA_ERROR_##err
+#define LUMIERA_ERROR_DECLARE(err) \
+extern const char* LUMIERA_ERROR_##err
 
-#define CINELERRA_ERROR_DEFINE(err, msg) \
-const char* CINELERRA_ERROR_##err = &quot;CINELERRA_ERROR_&quot; #err &quot;:&quot; msg
+#define LUMIERA_ERROR_DEFINE(err, msg) \
+const char* LUMIERA_ERROR_##err = &quot;LUMIERA_ERROR_&quot; #err &quot;:&quot; msg
 }}}
 
-thus a {{{CINELERRA_ERROR_DEFINE(NFOO, &quot;Foo not found&quot;)}}} will result in a string:
-&quot;~CINELERRA_ERROR_NFOO:Foo not found&quot;, having the identifier itself prepended to the string will ensure uniqueness of the generated literal (and thus its pointer value), reducing error testing to address comparison {{{cinelerra_error()==CINELERRA_ERROR_NFOO}}}. The message string is easily derived by {{{strchr(CINELERRA_ERROR_NFOO, ':')+1}}}
+thus a {{{LUMIERA_ERROR_DEFINE(NFOO, &quot;Foo not found&quot;)}}} will result in a string:
+&quot;~LUMIERA_ERROR_NFOO:Foo not found&quot;, having the identifier itself prepended to the string will ensure uniqueness of the generated literal (and thus its pointer value), reducing error testing to address comparison {{{lumiera_error()==LUMIERA_ERROR_NFOO}}}. The message string is easily derived by {{{strchr(LUMIERA_ERROR_NFOO, ':')+1}}}
 
 
 
 
 !! Allocation
-The next point is allocation failures. These are possible by C/C++ standard but don't actually happen anymore in Linux (except in few rare cases). Instead of gracefully handling this errors I'll add a {{{CINELERRA_DIE(message)}}} macro to this library later. This macro will just do (NoBug) logging and then doing a hard abort. It should be a macro because we want to preserve file/line location for logging.
+The next point is allocation failures. These are possible by C/C++ standard but don't actually happen anymore in Linux (except in few rare cases). Instead of gracefully handling this errors I'll add a {{{LUMIERA_DIE(message)}}} macro to this library later. This macro will just do (NoBug) logging and then doing a hard abort. It should be a macro because we want to preserve file/line location for logging.
 
 </pre>
 </div>
@@ -720,13 +720,13 @@ We use a common base class for all our application specific exceptions. These ex
 * getting standardized error messages automatically
 
 !!provided features
-The C++ errorhandling Classes and functions can be found in {{{common/error.hpp}}} (not to be confused with the elementary C errorhandling of the cinelerra support lib {{{lib/error.h}}}. See also the &quot;exceptionerrortest.cpp&quot;
+The C++ errorhandling Classes and functions can be found in {{{common/error.hpp}}} (not to be confused with the elementary C errorhandling of the Lumiera support lib {{{lib/error.h}}}. See also the &quot;exceptionerrortest.cpp&quot;
 * the constructor of the Exception base class will set the C-style error flag as well. Obviously, when an exception gets caught and handled, this error-flag should be reset (and this is the responsibility of the handler).
 * we add a __unknown()__ handler which will print additional diagnostics.
 * the Exception class has a diagnostic message intended for developers and a friendly message for the user. It is encouraged to write a detailed description of each error situation right into a string constant passed to the exception object ctor. This will serve the purpose of documenting the error situation in the source code and at the same time help diagnosis.
 * there is a variant of the constructor taking a reference to an std::exception. This is intended for //chained exceptions//. Whenever an handler catches an exception, but then decides to rethrow it with different classification, the original exception object should be passed on by using this constructor, so it's {{{what()}}} message can be preserved and will be included in the final log entry. While this may look like overkill in a small example, it is a very helpful facility in a larger layered application, where it is often difficult to spot the original cause of an exception encountered.
 * for each mayor category of Exception subclasses, we define a C-style error constant. The client code is free to define further detailed error constants and Exception subclasses.
-* to help defining Exception subclasses, a macro {{{CINELERRA_EXCEPTION_DECLARE}}} is provided.
+* to help defining Exception subclasses, a macro {{{LUMIERA_EXCEPTION_DECLARE}}} is provided.
 
 !!!basic Exception categories
 |!category|!description|
@@ -743,10 +743,10 @@ The C++ errorhandling Classes and functions can be found in {{{common/error.hpp}
 Framerates are stored as rational numbers eg. 30000/1001 for NTSC, this representation allows highly precise integer calculations for frames and times.
 
 ! Frames
-All calculations in cinelerra are based on frames which is a signed integer type. Together with a Framerate and a starting point, every frame can be exactly located.
+All calculations in Lumiera are based on frames which is a signed integer type. Together with a Framerate and a starting point, every frame can be exactly located.
 
 ! Time
-Time is used only internally in cinelerra, every external representation of time will be converted to frames. Time has a precision of 1 microsecond and is stored in POSIX struct timeval. Time is always handled as absolute time, thus frame addresses map to absolute times, there is at worst a 1us precision jitter but no drift.
+Time is used only internally in Lumiera, every external representation of time will be converted to frames. Time has a precision of 1 microsecond and is stored in POSIX struct timeval. Time is always handled as absolute time, thus frame addresses map to absolute times, there is at worst a 1us precision jitter but no drift.
 
 !! SMPTE and other Timecodes
 will be added on demand, but be frame based, not time based</pre>
@@ -1163,7 +1163,7 @@ Semaphores have quite ugly semantics and are very hard to debug. For now (and li
 Thread cancellation policies are not yet finally decided, for now we consider threads uncancelable!</pre>
 </div>
 <div title="MainMenu" modifier="CehTeh" modified="200707152251" created="200707102300" changecount="2">
-<pre>''[[Cinelerra3|index.html]]''
+<pre>''[[Lumiera|index.html]]''
 SupportLibrary
 [[Threads and Locking]]
 [[Plugins]]
@@ -1715,7 +1715,7 @@ Interfaces are immutable with the exception that new functions may be added. Ver
 
 An interface needs a name and a version. They define a block where the actual function prototypes can be added. New prototypes have to be added at the end, existing prototypes must never be changed.
 {{{
-CINELERRA_INTERFACE(name, version,
+LUMIERA_INTERFACE(name, version,
 	...
 );
 }}}
@@ -1723,21 +1723,21 @@ CINELERRA_INTERFACE(name, version,
 
 Each function prototype must be given with its different parts: return type, name, arguments list, and version.
 {{{
-	CINELERRA_IPROTO(ret, name, (args)),
+	LUMIERA_IPROTO(ret, name, (args)),
 }}}
 
 
 ! Example
 Together this would look like
 {{{
-CINELERRA_INTERFACE(foo, 1,
-	CINELERRA_IPROTO(void, bar, (void)),
-	CINELERRA_IPROTO(int, baz, (int i))
+LUMIERA_INTERFACE(foo, 1,
+	LUMIERA_IPROTO(void, bar, (void)),
+	LUMIERA_IPROTO(int, baz, (int i))
 );
 
-CINELERRA_INTERFACE(foo, 2,
-	CINELERRA_IPROTO(void, bar, (void)),
-	CINELERRA_IPROTO(int, baz, (float i))
+LUMIERA_INTERFACE(foo, 2,
+	LUMIERA_IPROTO(void, bar, (void)),
+	LUMIERA_IPROTO(int, baz, (float i))
 );
 }}}
 
@@ -1745,16 +1745,16 @@ Note that the version 2 interface changed the parameter from int to float for th
 
 The above gets expanded to:
 {{{
-struct cinelerra_interface_foo_1
+struct lumiera_interface_foo_1
 {
-	struct cinelerra_interface interface_header_;
+	struct lumiera_interface interface_header_;
 	void (*bar) (void);
 	int (*baz) (int i);
 };
 
-struct cinelerra_interface_foo_2
+struct lumiera_interface_foo_2
 {
-	struct cinelerra_interface interface_header_;
+	struct lumiera_interface interface_header_;
 	void (*bar) (void);
 	int (*baz) (float i);
 };
@@ -1764,7 +1764,7 @@ struct cinelerra_interface_foo_2
 <pre>A Plugin realizes an interface. This means that actual functions are mapped to the correspondending slots in the interface structure.
 
 {{{
-CINELERRA_INTERFACE_IMPLEMENT(interface, version, name,
+LUMIERA_INTERFACE_IMPLEMENT(interface, version, name,
 	/* TODO some hooks here */
 	functionnames...
 );
@@ -1790,13 +1790,13 @@ my_new_baz_function (float i)
 	...
 }
 
-CINELERRA_INTERFACE_IMPLEMENT(foo, 1, myfoointerface,
+LUMIERA_INTERFACE_IMPLEMENT(foo, 1, myfoointerface,
 	/* TODO some hooks here */
 	my_bar_function,
 	my_baz_function
 );
 
-CINELERRA_INTERFACE_IMPLEMENT(foo, 2, myfoointerface,
+LUMIERA_INTERFACE_IMPLEMENT(foo, 2, myfoointerface,
 	/* TODO some hooks here */
 	my_bar_function,
 	my_new_baz_function
@@ -1805,14 +1805,14 @@ CINELERRA_INTERFACE_IMPLEMENT(foo, 2, myfoointerface,
 
 The interface implementations expands to something like:
 {{{
-struct cinelerra_interface_foo_1 myfoointerface_1 =
+struct lumiera_interface_foo_1 myfoointerface_1 =
 {
 	/* TODO header initialization */
 	my_bar_function,
 	my_baz_function
 }
 
-struct cinelerra_interface_foo_2 myfoointerface_2 =
+struct lumiera_interface_foo_2 myfoointerface_2 =
 {
 	/* TODO header initialization */
 	my_bar_function,
@@ -1822,7 +1822,7 @@ struct cinelerra_interface_foo_2 myfoointerface_2 =
 </pre>
 </div>
 <div title="PluginLibrary" modifier="MichaelPloujnikov" modified="200707160351" created="200707111329" tags="excludeMissing" changecount="33">
-<pre>! Cinelerra Plugin API
+<pre>! Lumiera Plugin API
 
 There are only a few functions to manage Plugins. Actually a user requests interfaces. The libraries which implement Plugins are managed transparently.
 
@@ -1830,14 +1830,14 @@ Interfaces are exported as instances and are not necessary singleton. This means
 
 !! opening an Interface
 {{{
-CinelerraInterface
-cinelerra_interface_open (const char* plugin,
+LumieraInterface
+lumiera_interface_open (const char* plugin,
                           const char* name,
                           size_t min_revision);
 }}}
 
 !!! Parameters
-* ''{{{plugin}}}'' is the name of the Plugin whose interface to use. Plugins are looked up in $~CINELERRA_PLUGIN_PATH, which is a colon separated list of directories, and then in $plugin_install_dir which is the directory where standard plugins get installed when installing cinelerra (example: /usr/local/lib/cinelerra3/). The name itself can contain slashes, see PluginHierachy for details. It shall not include a library extension (.so). When NULL is passed, an interface from the main application is queried.
+* ''{{{plugin}}}'' is the name of the Plugin whose interface to use. Plugins are looked up in $~LUMIERA_PLUGIN_PATH, which is a colon separated list of directories, and then in $plugin_install_dir which is the directory where standard plugins get installed when installing Lumiera (example: /usr/local/lib/lumiera/). The name itself can contain slashes, see PluginHierachy for details. It shall not include a library extension (.so). When NULL is passed, an interface from the main application is queried.
 * ''{{{name}}}'' is the name of the queried interface.
 * ''{{{min_revision}}}'' is the expected minimal size of the interface structure, since interfaces are extended by adding new protos at the end, the size gives a unique value for each new revision.
 
@@ -1845,12 +1845,12 @@ cinelerra_interface_open (const char* plugin,
 Interfaces can opened multiple times and need to be closed for each call to open.
 
 !!! Return
-This function returns a pointer to the requested interface on success or NULL in case of an error. See {{{cinelerra_interface_error}}} about handing errors.
+This function returns a pointer to the requested interface on success or NULL in case of an error. See {{{lumiera_interface_error}}} about handing errors.
 
 !! closing an Interface
 {{{
 void
-cinelerra_interface_close (CinelerraInterface self);
+lumiera_interface_close (LumieraInterface self);
 }}}
 
 !!! Parameters
@@ -1870,7 +1870,7 @@ Plugins which are no longer in use are not automatically unloaded. The user can
 
 {{{
 int
-cinelerra_plugin_unload (const char* plugin);
+lumiera_plugin_unload (const char* plugin);
 }}}
 
 !!! Parameters
@@ -1880,20 +1880,20 @@ cinelerra_plugin_unload (const char* plugin);
 Tries to unload the named plugin. This only works when nothing else uses the Plugin.
 
 !!! Return
-Returns 0 on success or the number of active users on failure. See {{{cinelerra_interface_error}}} about handing errors.
+Returns 0 on success or the number of active users on failure. See {{{lumiera_interface_error}}} about handing errors.
 
 
 !! expire unused plugins
 {{{
 void
-cinelerra_plugin_expire (time_t age);
+lumiera_plugin_expire (time_t age);
 }}}
 
 !!! Parameters
 * ''{{{age}}}'' time in seconds when the plugin was last used
 
 !!! Semantic
-Calls {{{cinelerra_plugin_unload()}}} for each Plugin which has not been used for more than {{{age}}} seconds. This function might be infrequently called by the scheduler to remove things which are not needed (example: once a hour, remove plugins which have not been used for 2 hours).
+Calls {{{lumiera_plugin_unload()}}} for each Plugin which has not been used for more than {{{age}}} seconds. This function might be infrequently called by the scheduler to remove things which are not needed (example: once a hour, remove plugins which have not been used for 2 hours).
 
 !!! Return
 always succeeds.
@@ -1901,7 +1901,7 @@ always succeeds.
 !! error handling
 {{{
 const char*
-cinelerra_plugin_error ();
+lumiera_plugin_error ();
 }}}
 
 !!! Semantic
@@ -1944,7 +1944,7 @@ For binary compatibility everything will work well, provided that the caller kep
 </pre>
 </div>
 <div title="Plugins" modifier="CehTeh" modified="200708120129" created="200707111054" changecount="26">
-<pre>Cinelerra3 will use a very simple and language neutral plugin system. The focus is on easy and independent distribution of plugins and small specific interfaces. Ultimate flexibility is of second concern.
+<pre>Lumiera will use a very simple and language neutral plugin system. The focus is on easy and independent distribution of plugins and small specific interfaces. Ultimate flexibility is of second concern.
 
 ! Concept
 Plugins are just shared libraries which offer well defined Interfaces. A Plugin may offer more than one interface and may in turn request/use interfaces from other Plugins or from the main application.

From fbacb4cdb15d25a507833ff30d771aa4c8a806ac Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 10 Mar 2008 05:07:21 +0100
Subject: [PATCH 10/36] Lumiera renaming -- build system

---
 SConstruct                 | 24 ++++++++++-----------
 admin/scons/Buildhelper.py |  4 ++--
 bin/DIR_INFO               |  2 +-
 oldsrc/DIR_INFO            |  2 +-
 src/common/appconfig.cpp   |  6 +++---
 src/lib/DIR_INFO           |  2 +-
 src/lib/Makefile.am        | 44 +++++++++++++++++++-------------------
 src/proc/DIR_INFO          |  2 +-
 src/tool/DIR_INFO          |  2 +-
 src/tool/SConscript        |  4 ----
 tests/Makefile.am          | 12 +++++------
 tests/plugin/DIR_INFO      |  2 +-
 tests/plugin/Makefile.am   |  2 +-
 13 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/SConstruct b/SConstruct
index f3f9f0ddc..4d2f2ee9c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,6 +1,6 @@
 # -*- python -*-
 ##
-## SConstruct  -  SCons based build-sytem for Cinelerra
+## SConstruct  -  SCons based build-sytem for Lumiera
 ##
 
 #  Copyright (C)         Lumiera.org
@@ -61,7 +61,7 @@ def setupBasicEnvironment():
                , SRCDIR=SRCDIR
                , BINDIR=BINDIR
                , CPPPATH=["#"+SRCDIR]   # used to find includes, "#" means always absolute to build-root
-               , CPPDEFINES=['-DCINELERRA_VERSION='+VERSION ]  # note: it's a list to append further defines
+               , CPPDEFINES=['-DLUMIERA_VERSION='+VERSION ]     # note: it's a list to append further defines
                , CCFLAGS='-Wall '                                       # -fdiagnostics-show-option 
                )
     
@@ -234,21 +234,21 @@ def defineBuildTargets(env, artifacts):
         We use a custom function to declare a whole tree of srcfiles. 
     """
     
-    cinobj = ( srcSubtree(env,'$SRCDIR/backend') 
+    lumobj = ( srcSubtree(env,'$SRCDIR/backend') 
              + srcSubtree(env,'$SRCDIR/proc')
              + srcSubtree(env,'$SRCDIR/common')
              + srcSubtree(env,'$SRCDIR/lib')
              )
     plugobj = srcSubtree(env,'$SRCDIR/plugin', isShared=True)
-    core  = env.StaticLibrary('$BINDIR/core.la', cinobj)
-    #core = cinobj # use this for linking directly
+    core  = env.StaticLibrary('$BINDIR/core.la', lumobj)
+    #core = lumobj # use this for linking directly
     
     # use PCH to speed up building
     precomp = env.PrecompiledHeader('$SRCDIR/pre')
-    env.Depends(cinobj, precomp)
+    env.Depends(lumobj, precomp)
     
-    artifacts['cinelerra'] = env.Program('$BINDIR/cinelerra', ['$SRCDIR/main.cpp']+ core )
-    artifacts['plugins']   = env.SharedLibrary('$BINDIR/cinelerra-plugin', plugobj)
+    artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp']+ core )
+    artifacts['plugins'] = env.SharedLibrary('$BINDIR/lumiera-plugin', plugobj)
     
     # call subdir SConscript(s) for independent components
     SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts')
@@ -264,7 +264,7 @@ def definePostBuildTargets(env, artifacts):
     il = env.Alias('install-lib', '$DESTDIR/lib')
     env.Alias('install', [ib, il])
     
-    build = env.Alias('build', artifacts['cinelerra']+artifacts['plugins'])
+    build = env.Alias('build', artifacts['lumiera']+artifacts['plugins'])
     allbu = env.Alias('allbuild', build+artifacts['testsuite'])
     env.Default('build')
     # additional files to be cleaned when cleaning 'build'
@@ -286,11 +286,11 @@ def definePostBuildTargets(env, artifacts):
 def defineInstallTargets(env, artifacts):
     """ define some artifacts to be installed into target locations.
     """
-    env.Install(dir = '$DESTDIR/bin', source=artifacts['cinelerra'])
+    env.Install(dir = '$DESTDIR/bin', source=artifacts['lumiera'])
     env.Install(dir = '$DESTDIR/lib', source=artifacts['plugins'])
     env.Install(dir = '$DESTDIR/bin', source=artifacts['tools'])
     
-    env.Install(dir = '$DESTDIR/share/doc/cinelerra$VERSION/devel', source=artifacts['doxydoc'])
+    env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=artifacts['doxydoc'])
 
 #####################################################################
 
@@ -310,7 +310,7 @@ artifacts = {}
 # the various things we build. 
 # Each entry actually is a SCons-Node list.
 # Passing these entries to other builders defines dependencies.
-# 'cinelerra'   : the App
+# 'lumiera'     : the App
 # 'plugins'     : plugin shared lib
 # 'tools'       : small tool applications (e.g mpegtoc)
 # 'src,tar'     : source tree as tarball (without doc)
diff --git a/admin/scons/Buildhelper.py b/admin/scons/Buildhelper.py
index f37cff630..ae3f5fb1f 100644
--- a/admin/scons/Buildhelper.py
+++ b/admin/scons/Buildhelper.py
@@ -123,8 +123,8 @@ def Tarball(env,location,dirs,suffix=''):
     """
     targetID    = '../extern-tar%s' % suffix
     versionID   = env['VERSION']
-    defaultName = 'cinelerra%s_%s' % (suffix, versionID)
-    nameprefix  = 'cinelerra-%s/' %  (versionID)
+    defaultName = 'lumiera%s_%s' % (suffix, versionID)
+    nameprefix  = 'lumiera-%s/' %  (versionID)
     location    = env.subst(location)
     dirs        = env.subst(dirs)
     return env.Command(targetID,None, createTarball, 
diff --git a/bin/DIR_INFO b/bin/DIR_INFO
index c9048f8c1..9dafe61c3 100644
--- a/bin/DIR_INFO
+++ b/bin/DIR_INFO
@@ -1 +1 @@
-cinelerra executable(s) and libraries will be built here
+Lumiera executable(s) and libraries will be built here
diff --git a/oldsrc/DIR_INFO b/oldsrc/DIR_INFO
index 666124344..e3f9d5b47 100644
--- a/oldsrc/DIR_INFO
+++ b/oldsrc/DIR_INFO
@@ -1 +1 @@
-cinelerra2 sources, added per case when needed
+Cinelerra2 sources, added per case when needed
diff --git a/src/common/appconfig.cpp b/src/common/appconfig.cpp
index aba876966..fdf16cf40 100644
--- a/src/common/appconfig.cpp
+++ b/src/common/appconfig.cpp
@@ -45,8 +45,8 @@ namespace cinelerra
    *  to beeing dependant on inclusion order of headers. */
 //  scoped_ptr<Appconfig> Appconfig::theApp_;
 
-#ifndef CINELERRA_VERSION
-#define CINELERRA_VERSION 3++devel
+#ifndef LUMIERA_VERSION
+#define LUMIERA_VERSION 3++devel
 #endif
 
 
@@ -67,7 +67,7 @@ namespace cinelerra
     // install our own handler for undeclared exceptions
     std::set_unexpected (cinelerra::error::cinelerra_unexpectedException);
     
-    (*configParam_)["version"] = STRINGIFY (CINELERRA_VERSION);
+    (*configParam_)["version"] = STRINGIFY (LUMIERA_VERSION);
   }
   
   
diff --git a/src/lib/DIR_INFO b/src/lib/DIR_INFO
index 1bc5bfed3..6946a8b7e 100644
--- a/src/lib/DIR_INFO
+++ b/src/lib/DIR_INFO
@@ -1,2 +1,2 @@
-cinelerra support library
+Lumiera support library
 This dir contains the code for some tools and library code which will be used in many places
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 396e8ff81..89da7dc19 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -15,31 +15,31 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-libcin3_a_srcdir = $(top_srcdir)/src/lib
-noinst_LIBRARIES += libcin3.a
+liblumi_a_srcdir = $(top_srcdir)/src/lib
+noinst_LIBRARIES += liblumi.a
 
-libcin3_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
-libcin3_a_CPPFLAGS = -I$(top_srcdir)/src/
+liblumi_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
+liblumi_a_CPPFLAGS = -I$(top_srcdir)/src/
 
-libcin3_a_SOURCES = \
-	$(libcin3_a_srcdir)/plugin.c \
-	$(libcin3_a_srcdir)/error.c \
-	$(libcin3_a_srcdir)/time.c \
-	$(libcin3_a_srcdir)/framerate.c \
-	$(libcin3_a_srcdir)/mutex.c \
-	$(libcin3_a_srcdir)/rwlock.c \
-	$(libcin3_a_srcdir)/condition.c \
-	$(libcin3_a_srcdir)/references.c
+liblumi_a_SOURCES = \
+	$(liblumi_a_srcdir)/plugin.c \
+	$(liblumi_a_srcdir)/error.c \
+	$(liblumi_a_srcdir)/time.c \
+	$(liblumi_a_srcdir)/framerate.c \
+	$(liblumi_a_srcdir)/mutex.c \
+	$(liblumi_a_srcdir)/rwlock.c \
+	$(liblumi_a_srcdir)/condition.c \
+	$(liblumi_a_srcdir)/references.c
 
 
 noinst_HEADERS += \
-	$(libcin3_a_srcdir)/plugin.h \
-	$(libcin3_a_srcdir)/error.h \
-	$(libcin3_a_srcdir)/time.h \
-	$(libcin3_a_srcdir)/framerate.h \
-	$(libcin3_a_srcdir)/locking.h \
-	$(libcin3_a_srcdir)/mutex.h \
-	$(libcin3_a_srcdir)/rwlock.h \
-	$(libcin3_a_srcdir)/condition.h \
-	$(libcin3_a_srcdir)/references.h
+	$(liblumi_a_srcdir)/plugin.h \
+	$(liblumi_a_srcdir)/error.h \
+	$(liblumi_a_srcdir)/time.h \
+	$(liblumi_a_srcdir)/framerate.h \
+	$(liblumi_a_srcdir)/locking.h \
+	$(liblumi_a_srcdir)/mutex.h \
+	$(liblumi_a_srcdir)/rwlock.h \
+	$(liblumi_a_srcdir)/condition.h \
+	$(liblumi_a_srcdir)/references.h
 
diff --git a/src/proc/DIR_INFO b/src/proc/DIR_INFO
index e709101eb..dac54f26c 100644
--- a/src/proc/DIR_INFO
+++ b/src/proc/DIR_INFO
@@ -1 +1 @@
-cinelerra processing core
+Lumiera processing core
diff --git a/src/tool/DIR_INFO b/src/tool/DIR_INFO
index 76e84db53..c8933be3e 100644
--- a/src/tool/DIR_INFO
+++ b/src/tool/DIR_INFO
@@ -1 +1 @@
-source code of supplementary tools to be built alongside with Cinelerra
+source code of supplementary tools to be built alongside with Lumiera
diff --git a/src/tool/SConscript b/src/tool/SConscript
index fe3a35dcc..738483498 100644
--- a/src/tool/SConscript
+++ b/src/tool/SConscript
@@ -5,10 +5,6 @@
 
 Import('env','artifacts')
 
-# at the moment (8/07), Ichthyo tries to find out how to configure NoBug
-# does it help, if we set the NOBUG_LOG to the environment used for building??
-env = env.Clone()
-env['ENV']['NOBUG_LOG'] = 'ttt:WARNING'
 
 # build the ubiquitous Hello World application (note: C source)
 artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c')
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 26fe4b678..9e06a9a25 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,12 +21,12 @@ tests_srcdir = $(top_srcdir)/tests
 check_PROGRAMS += test-error
 test_error_SOURCES = $(tests_srcdir)/error/errortest.c
 test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_error_LDADD = libcin3.a -lnobugmt -lpthread -ldl
+test_error_LDADD = liblumi.a -lnobugmt -lpthread -ldl
 
 check_PROGRAMS += test-time
 test_time_SOURCES = $(tests_srcdir)/time/test-time.c
 test_time_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_time_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm
+test_time_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-locking
 test_locking_SOURCES = \
@@ -34,21 +34,21 @@ test_locking_SOURCES = \
 	$(tests_srcdir)/locking/mutex.c \
 	$(tests_srcdir)/locking/condition.c
 test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_locking_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm
+test_locking_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-llist
 test_llist_SOURCES = $(tests_srcdir)/library/test-llist.c
 test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_llist_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm
+test_llist_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-references
 test_references_SOURCES = $(tests_srcdir)/library/test-references.c
 test_references_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_references_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm -lrt
+test_references_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm -lrt
 
 #check_PROGRAMS += test-filehandles
 #test_filehandles_SOURCES = $(tests_srcdir)/backend/test-filehandles.c
 #test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-#test_filehandles_LDADD = libcin3backend.a libcin3.a -lnobugmt -lpthread -ldl -lm
+#test_filehandles_LDADD = liblumibackend.a liblumi.a -lnobugmt -lpthread -ldl -lm
 
 TESTS = $(tests_srcdir)/test.sh
diff --git a/tests/plugin/DIR_INFO b/tests/plugin/DIR_INFO
index 19ed2b9e2..c051168cc 100644
--- a/tests/plugin/DIR_INFO
+++ b/tests/plugin/DIR_INFO
@@ -1,3 +1,3 @@
-working example code for cinelerra's plugin system
+working example code for Lumiera's plugin system
 This directory contains example code which shows how to use specific features.
 All examples will be build and run as part of the testsuite
diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am
index 2cd33997e..c6afc8e36 100644
--- a/tests/plugin/Makefile.am
+++ b/tests/plugin/Makefile.am
@@ -20,7 +20,7 @@ noinst_PROGRAMS += test-plugin
 
 test_plugin_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Werror
 test_plugin_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src
-test_plugin_LDADD = libcin3.a -lnobugmt -lpthread -ldl
+test_plugin_LDADD = liblumi.a -lnobugmt -lpthread -ldl
 test_plugin_SOURCES = $(examples_srcdir)/plugin_main.c
 
 noinst_HEADERS += $(examples_srcdir)/hello_interface.h

From e737b9ef1ba938ca2cdd7372fb18c0cac0dd74b9 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 10 Mar 2008 06:09:44 +0100
Subject: [PATCH 11/36] Lumiera renaming -- source code

---
 src/backend/mediaaccessfacade.cpp             |   4 +-
 src/backend/mediaaccessfacade.hpp             |   2 +-
 src/common/appconfig.cpp                      |  10 +-
 src/common/appconfig.hpp                      |   8 +-
 src/common/error.cpp                          |  38 ++--
 src/common/error.hpp                          |  84 ++++-----
 src/common/factory.hpp                        |   8 +-
 src/common/multithread.hpp                    |  12 +-
 src/common/singleton.hpp                      |   6 +-
 src/common/singletonfactory.hpp               |   8 +-
 src/common/singletonpolicies.hpp              |  14 +-
 src/common/singletonpreconfigure.hpp          |  18 +-
 src/common/test/mockinjector.hpp              |   8 +-
 src/common/test/suite.cpp                     |   6 +-
 src/common/time.cpp                           |   4 +-
 src/common/time.hpp                           |   8 +-
 src/common/typelist.hpp                       |  10 +-
 src/common/visitor.cpp                        |   4 +-
 src/common/visitor.hpp                        |  10 +-
 src/common/visitordispatcher.hpp              |   8 +-
 src/common/visitorpolicies.hpp                |  12 +-
 src/lib/condition.c                           |  12 +-
 src/lib/condition.h                           |  86 ++++-----
 src/lib/error.c                               |  32 ++--
 src/lib/error.h                               |  38 ++--
 src/lib/framerate.c                           |   4 +-
 src/lib/framerate.h                           |  42 ++---
 src/lib/locking.h                             |  14 +-
 src/lib/mutex.c                               |  10 +-
 src/lib/mutex.h                               |  90 +++++-----
 src/lib/plugin.c                              | 164 +++++++++---------
 src/lib/plugin.h                              |  74 ++++----
 src/lib/references.c                          |  70 ++++----
 src/lib/references.h                          |  52 +++---
 src/lib/rwlock.c                              |  62 +++----
 src/lib/rwlock.h                              |  60 +++----
 src/lib/time.c                                |   6 +-
 src/lib/time.h                                |  66 +++----
 src/{cinelerra.h => lumiera.h}                |  12 +-
 src/main.cpp                                  |   4 +-
 src/nobugcfg.h                                |   2 +-
 src/plugin/helloplugin.c                      |   4 +-
 src/pre.hpp                                   |   8 +-
 src/proc/asset.cpp                            |   2 +-
 src/proc/asset.hpp                            |   4 +-
 src/proc/asset/db.hpp                         |   4 +-
 src/proc/asset/media.cpp                      |  22 +--
 src/proc/asset/media.hpp                      |   8 +-
 src/proc/asset/meta.hpp                       |   2 +-
 src/proc/asset/proc.hpp                       |   2 +-
 src/proc/asset/struct.hpp                     |   2 +-
 src/proc/asset/unknown.cpp                    |  16 +-
 src/proc/asset/unknown.hpp                    |   6 +-
 src/proc/assetmanager.cpp                     |  30 ++--
 src/proc/assetmanager.hpp                     |  12 +-
 src/proc/engine/codecadapter.hpp              |   2 +-
 src/proc/engine/pluginadapter.hpp             |   2 +-
 src/proc/engine/processor.hpp                 |   6 +-
 src/proc/mobject/builder/buildertool.hpp      |   8 +-
 src/proc/mobject/mobject.hpp                  |   6 +-
 src/proc/mobject/placement.hpp                |   2 +-
 src/proc/mobject/session.hpp                  |   2 +-
 src/proc/mobject/session/locatingpin.hpp      |   4 +-
 src/proc/mobject/session/segment.hpp          |   4 +-
 src/proc/mobject/session/session.cpp          |   2 +-
 src/proc/mobject/session/sessionimpl.cpp      |   2 +-
 src/proc/mobject/session/sessionimpl.hpp      |   2 +-
 src/tool/hello.c                              |   4 +-
 tests/10errorhandling.tests                   |   4 +-
 tests/50components.tests                      |  20 +--
 tests/54builder.tests                         |   2 +-
 tests/components/backend/mediaaccessmock.cpp  |   2 +-
 tests/components/backend/mediaaccessmock.hpp  |   2 +-
 tests/components/common/appconfigtest.cpp     |   6 +-
 .../components/common/exceptionerrortest.cpp  |  38 ++--
 .../components/common/factoryspecialtest.cpp  |   4 +-
 tests/components/common/factorytest.cpp       |   6 +-
 tests/components/common/singletontest.cpp     |  10 +-
 .../common/singletontestmocktest.cpp          |   8 +-
 tests/components/common/testtargetobj.hpp     |   8 +-
 tests/components/common/typelisttest.cpp      |   4 +-
 .../components/common/visitingtoolconcept.cpp |   8 +-
 .../common/visitingtoolextendedtest.cpp       |   4 +-
 tests/components/common/visitingtooltest.cpp  |   4 +-
 tests/components/helloworldtest.cpp           |   4 +-
 tests/components/mainsuite.cpp                |   2 +-
 .../components/proc/asset/createassettest.cpp |  18 +-
 .../proc/asset/mediastructurequerytest.cpp    |   2 +-
 .../mobject/controller/rendersegmenttest.cpp  |   2 +-
 .../proc/mobject/placementbasictest.cpp       |   2 +-
 .../proc/mobject/session/addcliptest.cpp      |   2 +-
 .../proc/mobject/session/testclip.cpp         |   4 +-
 tests/error/errortest.c                       |  16 +-
 tests/library/test-llist.c                    |   2 +-
 tests/library/test-references.c               |  10 +-
 tests/locking/condition.c                     |   8 +-
 tests/locking/mutex.c                         |   8 +-
 tests/locking/test-condition.c                |  10 +-
 tests/locking/test-locking.c                  |   2 +-
 tests/plugin/example_plugin.c                 |  16 +-
 tests/plugin/example_plugin.cpp               |  16 +-
 tests/plugin/hello_interface.h                |   8 +-
 tests/plugin/plugin_main.c                    |  34 ++--
 tests/time/test-time.c                        |  86 ++++-----
 104 files changed, 866 insertions(+), 866 deletions(-)
 rename src/{cinelerra.h => lumiera.h} (90%)

diff --git a/src/backend/mediaaccessfacade.cpp b/src/backend/mediaaccessfacade.cpp
index bd12068f9..ad52698b8 100644
--- a/src/backend/mediaaccessfacade.cpp
+++ b/src/backend/mediaaccessfacade.cpp
@@ -26,13 +26,13 @@
 #include "common/util.hpp"
 
 using util::isnil;
-using cinelerra::error::Invalid;
+using lumiera::error::Invalid;
 
 namespace backend_interface
   {
   
   /** storage for the SingletonFactory 
-   *  (actually a cinelerra::test::MockInjector) */
+   *  (actually a lumiera::test::MockInjector) */
   Singleton<MediaAccessFacade> MediaAccessFacade::instance;
 
   
diff --git a/src/backend/mediaaccessfacade.hpp b/src/backend/mediaaccessfacade.hpp
index 15579d491..63741b02e 100644
--- a/src/backend/mediaaccessfacade.hpp
+++ b/src/backend/mediaaccessfacade.hpp
@@ -59,7 +59,7 @@ namespace backend_interface
        *          information from this file, NULL if the
        *          file is not acessible.
        */
-      virtual FileHandle queryFile (const char* name)  throw(cinelerra::error::Invalid);
+      virtual FileHandle queryFile (const char* name)  throw(lumiera::error::Invalid);
       
       /** request for information about the n-th channel 
        *  of the file refered by FileHandle.
diff --git a/src/common/appconfig.cpp b/src/common/appconfig.cpp
index fdf16cf40..612376022 100644
--- a/src/common/appconfig.cpp
+++ b/src/common/appconfig.cpp
@@ -34,7 +34,7 @@
 
 using util::isnil;
 
-namespace cinelerra
+namespace lumiera
   {
   
   /** This internal pointer to the single instance is deliberately
@@ -52,7 +52,7 @@ namespace cinelerra
 
   /** perform initialization on first access. 
    *  A call is placed in static initialization code
-   *  included in cinelerra.h; thus it will happen
+   *  included in lumiera.h; thus it will happen
    *  probably very early.
    */
   Appconfig::Appconfig()
@@ -65,7 +65,7 @@ namespace cinelerra
     INFO(config, "Basic application configuration triggered.");
     
     // install our own handler for undeclared exceptions
-    std::set_unexpected (cinelerra::error::cinelerra_unexpectedException);
+    std::set_unexpected (lumiera::error::lumiera_unexpectedException);
     
     (*configParam_)["version"] = STRINGIFY (LUMIERA_VERSION);
   }
@@ -89,10 +89,10 @@ namespace cinelerra
     catch (...)
       {
         ERROR(config, "error while accessing configuration parameter \"%s\".", key.c_str());
-        throw cinelerra::error::Fatal ();
+        throw lumiera::error::Fatal ();
   }   }
 
   
 
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/src/common/appconfig.hpp b/src/common/appconfig.hpp
index bbd50df6f..984236755 100644
--- a/src/common/appconfig.hpp
+++ b/src/common/appconfig.hpp
@@ -34,8 +34,8 @@
  */
 
 
-#ifndef CINELERRA_APPCONFIG_H
-#define CINELERRA_APPCONFIG_H
+#ifndef LUMIERA_APPCONFIG_H
+#define LUMIERA_APPCONFIG_H
 
 #include <map>
 #include <string>
@@ -45,7 +45,7 @@
 
 
 
-namespace cinelerra
+namespace lumiera
   {
   using std::string;
   using boost::scoped_ptr;
@@ -104,5 +104,5 @@ namespace cinelerra
 
 
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/error.cpp b/src/common/error.cpp
index 17e18e676..e708c5d3a 100644
--- a/src/common/error.cpp
+++ b/src/common/error.cpp
@@ -1,5 +1,5 @@
 /*
-  Error  -  Cinelerra Exception Interface
+  Error  -  Lumiera Exception Interface
  
   Copyright (C)         Lumiera.org
     2008,               Hermann Vosseler <Ichthyostega@web.de>
@@ -33,7 +33,7 @@ using util::isnil;
 using std::exception;
 
 
-namespace cinelerra
+namespace lumiera
   {
 
   namespace error
@@ -46,23 +46,23 @@ namespace cinelerra
      */
     inline const string default_usermsg (Error* exception_obj)  throw() 
     {
-      return string("Sorry, Cinelerra encountered an internal error. (")
+      return string("Sorry, Lumiera encountered an internal error. (")
            + typeid(*exception_obj).name() + ")";
     }
     
     
     /* constants to be used as error IDs */
-    CINELERRA_ERROR_DEFINE (LOGIC    , "internal logic broken");   
-    CINELERRA_ERROR_DEFINE (FATAL    , "floundered");      
-    CINELERRA_ERROR_DEFINE (CONFIG   , "misconfiguration"); 
-    CINELERRA_ERROR_DEFINE (STATE    , "unforseen state"); 
-    CINELERRA_ERROR_DEFINE (INVALID  , "invalid input or parameters"); 
-    CINELERRA_ERROR_DEFINE (EXTERNAL , "failure in external service"); 
-    CINELERRA_ERROR_DEFINE (ASSERTION, "assertion failure");
+    LUMIERA_ERROR_DEFINE (LOGIC    , "internal logic broken");   
+    LUMIERA_ERROR_DEFINE (FATAL    , "floundered");      
+    LUMIERA_ERROR_DEFINE (CONFIG   , "misconfiguration"); 
+    LUMIERA_ERROR_DEFINE (STATE    , "unforseen state"); 
+    LUMIERA_ERROR_DEFINE (INVALID  , "invalid input or parameters"); 
+    LUMIERA_ERROR_DEFINE (EXTERNAL , "failure in external service"); 
+    LUMIERA_ERROR_DEFINE (ASSERTION, "assertion failure");
 
   } // namespace error
   
-  CINELERRA_ERROR_DEFINE (EXCEPTION, "generic cinelerra exception"); 
+  LUMIERA_ERROR_DEFINE (EXCEPTION, "generic Lumiera exception"); 
   
   
   
@@ -75,7 +75,7 @@ namespace cinelerra
       desc_ (description),
       cause_ ("")
   {
-    cinelerra_error_set (this->id_);
+    lumiera_error_set (this->id_);
   }
   
   
@@ -87,7 +87,7 @@ namespace cinelerra
       desc_ (description),
       cause_ (extractCauseMsg(cause))
   {
-    cinelerra_error_set (this->id_);
+    lumiera_error_set (this->id_);
   }
   
   
@@ -103,7 +103,7 @@ namespace cinelerra
 
   
   /** Description of the problem, including the internal char constant
-   *  in accordance to cinelerra's error identification scheme.
+   *  in accordance to Lumiera's error identification scheme.
    *  If a root cause can be obtained, this will be included in the
    *  generated output as well. 
    */
@@ -167,15 +167,15 @@ namespace cinelerra
   namespace error
   {
     
-    void cinelerra_unexpectedException ()  throw()
+    void lumiera_unexpectedException ()  throw()
     {
       const char* is_halted 
-        = "### Cinelerra halted due to an unexpected Error ###";
+        = "### Lumiera halted due to an unexpected Error ###";
       
       std::cerr << "\n" << is_halted << "\n\n";
       ERROR (NOBUG_ON, "%s", is_halted);
       
-      if (const char * errorstate = cinelerra_error ())
+      if (const char * errorstate = lumiera_error ())
         ERROR (NOBUG_ON, "last registered error was....\n%s", errorstate);
       
       std::terminate();
@@ -183,7 +183,7 @@ namespace cinelerra
 
     void assertion_terminate (const string& location)
     {
-      throw Fatal (location, CINELERRA_ERROR_ASSERTION)
+      throw Fatal (location, LUMIERA_ERROR_ASSERTION)
                  .setUsermsg("Program terminated because of violating "
                              "an internal consistency check.");    
     }
@@ -191,4 +191,4 @@ namespace cinelerra
     
   } // namespace error
   
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/src/common/error.hpp b/src/common/error.hpp
index 15e60f022..4ccb8b1d7 100644
--- a/src/common/error.hpp
+++ b/src/common/error.hpp
@@ -1,5 +1,5 @@
 /*
-  ERROR.hpp  -  Cinelerra Exception Interface
+  ERROR.hpp  -  Lumiera Exception Interface
  
   Copyright (C)         Lumiera.org
     2008,               Hermann Vosseler <Ichthyostega@web.de>
@@ -21,26 +21,26 @@
 */
 
 
-#ifndef CINELERRA_ERROR_HPP_
-#define CINELERRA_ERROR_HPP_
+#ifndef LUMIERA_ERROR_HPP_
+#define LUMIERA_ERROR_HPP_
 
 #include <string>
 #include "nobugcfg.h"
 #include "lib/error.h"
 
 
-namespace cinelerra
+namespace lumiera
   {
   using std::string;
 
 
   
   /** error-ID for unspecified exceptions */
-  CINELERRA_ERROR_DECLARE(EXCEPTION);  
+  LUMIERA_ERROR_DECLARE(EXCEPTION);  
   
   /**
    * Interface and Baseclass of all Exceptions thrown 
-   * from within cinelerra (C++) code. Common operations
+   * from within Lumiera (C++) code. Common operations
    * for getting an diagnostic message and for obtaining
    * the root cause, i.e. the first exception encountered
    * in a chain of exceptions. 
@@ -48,9 +48,9 @@ namespace cinelerra
   class Error : public std::exception
     {
     public:
-      Error (string description="", const char* id=CINELERRA_ERROR_EXCEPTION) throw();
+      Error (string description="", const char* id=LUMIERA_ERROR_EXCEPTION) throw();
       Error (std::exception& cause,
-             string description="", const char* id=CINELERRA_ERROR_EXCEPTION) throw();
+             string description="", const char* id=LUMIERA_ERROR_EXCEPTION) throw();
       
       Error (const Error&) throw();
       virtual ~Error () throw() {};
@@ -58,7 +58,7 @@ namespace cinelerra
       /** yield a diagnostic message characterizing the problem */
       virtual const char* what () const throw();
 
-      /** the internal cinelerra-error-ID (was set as C-errorstate in ctor) */
+      /** the internal Lumiera-error-ID (was set as C-errorstate in ctor) */
       const char* getID () const throw() { return this->id_; }
       
       /** extract the message to be displayed for the user */
@@ -80,7 +80,7 @@ namespace cinelerra
       
       
     private:
-      const char* id_;       ///< an CINELERRA_ERROR id, which is set as errorstate on construction
+      const char* id_;       ///< an LUMIERA_ERROR id, which is set as errorstate on construction
       string msg_;           ///< friendly message intended for users (to be localized)
       string desc_;          ///< detailed description of the error situation for the developers
       mutable string what_;  ///< buffer for generating the detailed description on demand
@@ -105,68 +105,68 @@ namespace cinelerra
      *  can be considered a severe design flaw; we can just
      *  add some diagnostics prior to halting.
      */
-    void cinelerra_unexpectedException ()  throw();
+    void lumiera_unexpectedException ()  throw();
 
     /** throw an error::Fatal indicating "assertion failure" */
     void assertion_terminate (const string& location);
     
 
     /* constants to be used as error IDs */
-    CINELERRA_ERROR_DECLARE (LOGIC    );    ///< contradiction to internal logic assumptions detected  
-    CINELERRA_ERROR_DECLARE (FATAL    );    ///< unable to cope with, internal logic floundered     
-    CINELERRA_ERROR_DECLARE (CONFIG   );    ///< execution aborted due to misconfiguration
-    CINELERRA_ERROR_DECLARE (STATE    );    ///< unforeseen internal state
-    CINELERRA_ERROR_DECLARE (INVALID  );    ///< invalid input or parameters encountered
-    CINELERRA_ERROR_DECLARE (EXTERNAL );    ///< failure in external service the application relies on
-    CINELERRA_ERROR_DECLARE (ASSERTION);    ///< assertion failure
+    LUMIERA_ERROR_DECLARE (LOGIC    );    ///< contradiction to internal logic assumptions detected  
+    LUMIERA_ERROR_DECLARE (FATAL    );    ///< unable to cope with, internal logic floundered     
+    LUMIERA_ERROR_DECLARE (CONFIG   );    ///< execution aborted due to misconfiguration
+    LUMIERA_ERROR_DECLARE (STATE    );    ///< unforeseen internal state
+    LUMIERA_ERROR_DECLARE (INVALID  );    ///< invalid input or parameters encountered
+    LUMIERA_ERROR_DECLARE (EXTERNAL );    ///< failure in external service the application relies on
+    LUMIERA_ERROR_DECLARE (ASSERTION);    ///< assertion failure
     
 /** Macro for creating derived exception classes properly 
- *  integrated into cinelerra's exception hierarchy. Using
+ *  integrated into Lumiera's exception hierarchy. Using
  *  this macro asures that the new class will get the full
  *  set of constructors and behaviour common to all exception
  *  classes, so it should be used when creating an derived
  *  exception type for more then stricly local purposes
  */
-#define CINELERRA_EXCEPTION_DECLARE(CLASS, PARENT, _ID_) \
-    class CLASS : public PARENT                          \
-      {                                                  \
-      public:                                            \
-        CLASS (std::string description="",               \
-               const char* id=_ID_) throw()              \
-        : PARENT (description, id)  {}                   \
-                                                         \
-        CLASS (std::exception& cause,                    \
-               std::string description="",               \
-               const char* id=_ID_) throw()              \
-        : PARENT (cause, description, id)   {}           \
+#define LUMIERA_EXCEPTION_DECLARE(CLASS, PARENT, _ID_) \
+    class CLASS : public PARENT                         \
+      {                                                 \
+      public:                                           \
+        CLASS (std::string description="",              \
+               const char* id=_ID_) throw()             \
+        : PARENT (description, id)  {}                  \
+                                                        \
+        CLASS (std::exception& cause,                   \
+               std::string description="",              \
+               const char* id=_ID_) throw()             \
+        : PARENT (cause, description, id)   {}          \
       };
 
-    //---------------------------CLASS-----PARENT--ID----------------------
-    CINELERRA_EXCEPTION_DECLARE (Logic,    Error,  CINELERRA_ERROR_LOGIC);
-    CINELERRA_EXCEPTION_DECLARE (Fatal,    Logic,  CINELERRA_ERROR_FATAL);
-    CINELERRA_EXCEPTION_DECLARE (Config,   Error,  CINELERRA_ERROR_CONFIG);
-    CINELERRA_EXCEPTION_DECLARE (State,    Error,  CINELERRA_ERROR_STATE);
-    CINELERRA_EXCEPTION_DECLARE (Invalid,  Error,  CINELERRA_ERROR_INVALID);
-    CINELERRA_EXCEPTION_DECLARE (External, Error,  CINELERRA_ERROR_EXTERNAL);
+    //-------------------------CLASS-----PARENT--ID----------------------
+    LUMIERA_EXCEPTION_DECLARE (Logic,    Error,  LUMIERA_ERROR_LOGIC);
+    LUMIERA_EXCEPTION_DECLARE (Fatal,    Logic,  LUMIERA_ERROR_FATAL);
+    LUMIERA_EXCEPTION_DECLARE (Config,   Error,  LUMIERA_ERROR_CONFIG);
+    LUMIERA_EXCEPTION_DECLARE (State,    Error,  LUMIERA_ERROR_STATE);
+    LUMIERA_EXCEPTION_DECLARE (Invalid,  Error,  LUMIERA_ERROR_INVALID);
+    LUMIERA_EXCEPTION_DECLARE (External, Error,  LUMIERA_ERROR_EXTERNAL);
     
     
   } // namespace error
 
-} // namespace cinelerra
+} // namespace lumiera
 
 
 
 /******************************************************
  * if NoBug is used, redefine some macros 
- * to rather throw Cinelerra Errors instead of aborting
+ * to rather throw Lumiera Errors instead of aborting
  */
 #ifdef NOBUG_ABORT
 #undef NOBUG_ABORT
 #define CIN_NOBUG_LOCATION \
   std::string (NOBUG_BASENAME(__FILE__)) +":"+ NOBUG_STRINGIZE(__LINE__) + ", function " + __func__
 #define NOBUG_ABORT \
-  cinelerra::error::assertion_terminate (CIN_NOBUG_LOCATION);
+  lumiera::error::assertion_terminate (CIN_NOBUG_LOCATION);
 #endif
 
 
-#endif // CINELERRA_ERROR_HPP_
+#endif // LUMIERA_ERROR_HPP_
diff --git a/src/common/factory.hpp b/src/common/factory.hpp
index a4b953b3a..5645cfba6 100644
--- a/src/common/factory.hpp
+++ b/src/common/factory.hpp
@@ -21,14 +21,14 @@
 */
 
 
-#ifndef CINELERRA_FACTORY_H
-#define CINELERRA_FACTORY_H
+#ifndef LUMIERA_FACTORY_H
+#define LUMIERA_FACTORY_H
 
 #include <tr1/memory>
 
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace factory
     {
@@ -141,5 +141,5 @@ namespace cinelerra
   using factory::Factory;
   
   
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/multithread.hpp b/src/common/multithread.hpp
index cc6eca1c6..1dbbac519 100644
--- a/src/common/multithread.hpp
+++ b/src/common/multithread.hpp
@@ -23,21 +23,21 @@
 
 
 
-#ifndef CINELERRA_MULTITHREAD_H
-#define CINELERRA_MULTITHREAD_H
+#ifndef LUMIERA_MULTITHREAD_H
+#define LUMIERA_MULTITHREAD_H
 
 #include "nobugcfg.h"
 
 
-namespace cinelerra
+namespace lumiera
   {
       
     /**
      * Interface/Policy for managing parallelism issues.
      * Basically everything is forwarded to the corresponding backend functions,
-     * because managing threads and locking belongs to the cinelerra backend layer.
+     * because managing threads and locking belongs to the Lumiera backend layer.
      * 
-     * @todo actually implement this policy using the cinelerra databackend.
+     * @todo actually implement this policy using the Lumiera databackend.
      */
     struct Thread
       {
@@ -52,5 +52,5 @@ namespace cinelerra
       };
     
   
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/singleton.hpp b/src/common/singleton.hpp
index 9f149214f..c5de1474d 100644
--- a/src/common/singleton.hpp
+++ b/src/common/singleton.hpp
@@ -30,7 +30,7 @@
  ** e.g. sometimes we want to include a hook for injecting Test Mock instances.
  **
  ** You'll find the default Policies in singletonfactory.hpp and the default
- ** definition of type cinelerra::singleton in singletonpreconfigure.hpp
+ ** definition of type lumiera::singleton in singletonpreconfigure.hpp
  ** 
  ** @see SingletonFactory
  ** @see singleton::StaticCreate
@@ -40,8 +40,8 @@
  */
 
 
-#ifndef CINELERRA_SINGLETON_H
-#define CINELERRA_SINGLETON_H
+#ifndef LUMIERA_SINGLETON_H
+#define LUMIERA_SINGLETON_H
 
 
 #include "common/singletonpolicies.hpp"
diff --git a/src/common/singletonfactory.hpp b/src/common/singletonfactory.hpp
index 319722fcf..026b6990e 100644
--- a/src/common/singletonfactory.hpp
+++ b/src/common/singletonfactory.hpp
@@ -31,8 +31,8 @@ This code is heavily inspired by
 
 
 
-#ifndef CINELERRA_SINGLETONFACTORY_H
-#define CINELERRA_SINGLETONFACTORY_H
+#ifndef LUMIERA_SINGLETONFACTORY_H
+#define LUMIERA_SINGLETONFACTORY_H
 
 
 #include "common/singletonpolicies.hpp"  ///< several Policies usable together with SingletonFactory
@@ -43,7 +43,7 @@ This code is heavily inspired by
 //#include <boost/bind.hpp>
 
 
-namespace cinelerra
+namespace lumiera
   {
   
   /**
@@ -136,5 +136,5 @@ namespace cinelerra
 /////       It seems this would either cost us much of the flexibility or get complicated
 /////       to a point where we could as well implement our own Depenency Injection Manager.
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/singletonpolicies.hpp b/src/common/singletonpolicies.hpp
index 5ae31b939..f0b448305 100644
--- a/src/common/singletonpolicies.hpp
+++ b/src/common/singletonpolicies.hpp
@@ -31,8 +31,8 @@ This code is heavily inspired by
 
 
 
-#ifndef CINELERRA_SINGLETONPOLICIES_H
-#define CINELERRA_SINGLETONPOLICIES_H
+#ifndef LUMIERA_SINGLETONPOLICIES_H
+#define LUMIERA_SINGLETONPOLICIES_H
 
 #include "common/multithread.hpp"
 #include "common/error.hpp"
@@ -40,11 +40,11 @@ This code is heavily inspired by
 #include <vector>
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace singleton
     {
-      /* == several Policies usable in conjunction with cinelerra::Singleton == */
+      /* === several Policies usable in conjunction with lumiera::Singleton === */
       
       /** 
        * Policy placing the Singleton instance into a statically allocated buffer
@@ -133,13 +133,13 @@ namespace cinelerra
       
       /**
        * Policy for handling multithreaded access to the singleton instance
-       * @todo actually implement this policy using the cinelerra databackend.
+       * @todo actually implement this policy using the Lumiera databackend.
        */
       template<class S>
       struct Multithreaded
         {
           typedef volatile S VolatileType;
-          typedef cinelerra::Thread::Lock<S> Lock;
+          typedef lumiera::Thread::Lock<S> Lock;
         };
       
       
@@ -156,5 +156,5 @@ namespace cinelerra
     
   } // namespace singleton
   
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/singletonpreconfigure.hpp b/src/common/singletonpreconfigure.hpp
index 9f3cfb8b2..e9b12e3d6 100644
--- a/src/common/singletonpreconfigure.hpp
+++ b/src/common/singletonpreconfigure.hpp
@@ -31,7 +31,7 @@
  ** One reason why one wants special Singleton behaviour is testing: Without
  ** altering the executable, for running some tests we need to inject a Test Mock
  ** in place of some service object, so we can verify the behaviour of the code
- ** <i>using</i> this service. For this, we mix cinelerra::test::MockInjector
+ ** <i>using</i> this service. For this, we mix lumiera::test::MockInjector
  ** into the actual Singleton type.
  **
  ** @note we declare the specialisations into the target namespace
@@ -41,13 +41,13 @@
  */
 
 
-#ifndef CINELERRA_SINGLETONPRECONFIGURE_H
-#define CINELERRA_SINGLETONPRECONFIGURE_H
+#ifndef LUMIERA_SINGLETONPRECONFIGURE_H
+#define LUMIERA_SINGLETONPRECONFIGURE_H
 
 #include "common/test/mockinjector.hpp"
 
 
-namespace cinelerra
+namespace lumiera
   {
   /**
    * Default Singleton configuration
@@ -67,15 +67,15 @@ namespace cinelerra
   namespace test
     {
     class TestSingletonO;
-    using cinelerra::Singleton;
+    using lumiera::Singleton;
     
   } // namespace test
-}  // namespace cinelerra
+}  // namespace lumiera
 
 namespace backend_interface
   {
   class MediaAccessFacade;
-  using cinelerra::Singleton;
+  using lumiera::Singleton;
     
 } // namespace backend_interface
 
@@ -87,7 +87,7 @@ namespace backend_interface
   /* Specialisation Definitions */
   /* ************************** */
 
-namespace cinelerra
+namespace lumiera
   {
   
   using test::MockInjector;
@@ -104,7 +104,7 @@ namespace cinelerra
     : public MockInjector<backend_interface::MediaAccessFacade>
     { };
 
-} // namespace cinelerra
+} // namespace lumiera
 
 
 
diff --git a/src/common/test/mockinjector.hpp b/src/common/test/mockinjector.hpp
index 28258e91e..4daf78081 100644
--- a/src/common/test/mockinjector.hpp
+++ b/src/common/test/mockinjector.hpp
@@ -22,8 +22,8 @@
 
 
 
-#ifndef CINELERRA_TEST_MOCKINJECTOR_H
-#define CINELERRA_TEST_MOCKINJECTOR_H
+#ifndef LUMIERA_TEST_MOCKINJECTOR_H
+#define LUMIERA_TEST_MOCKINJECTOR_H
 
 
 #include "common/singletonfactory.hpp"
@@ -31,7 +31,7 @@
 #include <boost/scoped_ptr.hpp>
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -90,5 +90,5 @@ namespace cinelerra
       
   } // namespace test
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/test/suite.cpp b/src/common/test/suite.cpp
index c81c88097..897a7d04f 100644
--- a/src/common/test/suite.cpp
+++ b/src/common/test/suite.cpp
@@ -133,7 +133,7 @@ namespace test
     TRACE(test, "Test-Suite( groupID=%s )\n", groupID.c_str () );
     
     if (!testcases.getGroup(groupID))
-      throw cinelerra::error::Invalid ();
+      throw lumiera::error::Invalid ();
       //throw "empty testsuite";     /////////// TODO Errorhandling!
   }
     
@@ -155,7 +155,7 @@ namespace test
   {
     PTestMap tests = testcases.getGroup(groupID_);
     if (!tests)
-      throw cinelerra::error::Invalid (); ///////// TODO: pass error description
+      throw lumiera::error::Invalid (); ///////// TODO: pass error description
     
     if (0 < cmdline.size())
       {
@@ -209,7 +209,7 @@ namespace test
           }
         catch (...) 
           {
-            std::cout << "PLANNED ============= " << cinelerra_error() << "\n";
+            std::cout << "PLANNED ============= " << lumiera_error() << "\n";
           }
         std::cout << "END\n";
       }
diff --git a/src/common/time.cpp b/src/common/time.cpp
index c208fcb46..a37979c6b 100644
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -25,7 +25,7 @@
 #include <limits>
 
 
-namespace cinelerra
+namespace lumiera
   {
 
    // TODO: dummy values; should be adjusted when switching to the real time implementation provided by the backend
@@ -34,4 +34,4 @@ namespace cinelerra
    const Time Time::MIN = -std::numeric_limits<long>::max();
 
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/src/common/time.hpp b/src/common/time.hpp
index c4fc22244..d065c3f36 100644
--- a/src/common/time.hpp
+++ b/src/common/time.hpp
@@ -21,13 +21,13 @@
 */
 
 
-#ifndef CINELERRA_TIME_H
-#define CINELERRA_TIME_H
+#ifndef LUMIERA_TIME_H
+#define LUMIERA_TIME_H
 
 #include <boost/operators.hpp>
 
 
-namespace cinelerra
+namespace lumiera
   {
 
 
@@ -56,5 +56,5 @@ namespace cinelerra
   
 
    
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/typelist.hpp b/src/common/typelist.hpp
index 6d2720fcb..f358a605e 100644
--- a/src/common/typelist.hpp
+++ b/src/common/typelist.hpp
@@ -47,19 +47,19 @@ This code is heavily inspired by
  **
  ** Interface for using this facility is the template Types(.....) for up to 20 Type parameters
  **
- ** @see cinelerra::visitor::Applicable usage example
+ ** @see lumiera::visitor::Applicable usage example
  ** @see typelisttest.cpp
  ** 
  */
 
 
-#ifndef CINELERRA_TYPELIST_H
-#define CINELERRA_TYPELIST_H
+#ifndef LUMIERA_TYPELIST_H
+#define LUMIERA_TYPELIST_H
 
 
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace typelist
     {
@@ -116,5 +116,5 @@ namespace cinelerra
     
   } // namespace typelist
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/visitor.cpp b/src/common/visitor.cpp
index f702f809b..91b195623 100644
--- a/src/common/visitor.cpp
+++ b/src/common/visitor.cpp
@@ -23,7 +23,7 @@
 
 #include "common/visitor.hpp"
 
-namespace cinelerra
+namespace lumiera
   {
   namespace visitor
     {
@@ -32,4 +32,4 @@ namespace cinelerra
   
   } // namespace visitor
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/src/common/visitor.hpp b/src/common/visitor.hpp
index 251254a88..837ddf713 100644
--- a/src/common/visitor.hpp
+++ b/src/common/visitor.hpp
@@ -37,7 +37,7 @@ Credits for many further implementation ideas go to
 
 /** @file visitor.hpp
  ** A library implementation of the <b>Visitor Pattern</b> taylored specifically
- ** to cinelerra's needs within the Proc Layer. Visitor enables <b>double dispatch</b>
+ ** to Lumiera's needs within the Proc Layer. Visitor enables <b>double dispatch</b>
  ** calls, based both on the concrete type of some target object and the concrete type of
  ** a tool object being applied to this target. The code carrying out this tool application
  ** (and thus triggering the double dispatch) need not know any of these concret types and is
@@ -73,8 +73,8 @@ Credits for many further implementation ideas go to
 
 
 
-#ifndef CINELERRA_VISITOR_H
-#define CINELERRA_VISITOR_H
+#ifndef LUMIERA_VISITOR_H
+#define LUMIERA_VISITOR_H
 
 #include "common/visitorpolicies.hpp"
 #include "common/visitordispatcher.hpp"
@@ -82,7 +82,7 @@ Credits for many further implementation ideas go to
 #include "common/typelist.hpp"
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace visitor
     {
@@ -229,5 +229,5 @@ namespace cinelerra
     
   } // namespace visitor
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/visitordispatcher.hpp b/src/common/visitordispatcher.hpp
index 0be12b2df..dcc28391b 100644
--- a/src/common/visitordispatcher.hpp
+++ b/src/common/visitordispatcher.hpp
@@ -22,8 +22,8 @@
 
 
 
-#ifndef CINELERRA_VISITORDISPATCHER_H
-#define CINELERRA_VISITORDISPATCHER_H
+#ifndef LUMIERA_VISITORDISPATCHER_H
+#define LUMIERA_VISITORDISPATCHER_H
 
 #include "common/error.hpp"
 #include "common/util.hpp"
@@ -33,7 +33,7 @@
 #include <vector>
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace visitor
     {
@@ -211,5 +211,5 @@ namespace cinelerra
     
   } // namespace visitor
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/common/visitorpolicies.hpp b/src/common/visitorpolicies.hpp
index 6b9f353a5..e59a2f5b2 100644
--- a/src/common/visitorpolicies.hpp
+++ b/src/common/visitorpolicies.hpp
@@ -22,20 +22,20 @@
 
 
 /** @file visitorpolicies.hpp
- ** Policies usable for configuring the cinelerra::visitor::Tool for different kinds of error handling. 
+ ** Policies usable for configuring the lumiera::visitor::Tool for different kinds of error handling. 
  ** @see buildertool.hpp for another flavor (calling and catch-all-function)
  **
  */
 
 
 
-#ifndef CINELERRA_VISITORPOLICIES_H
-#define CINELERRA_VISITORPOLICIES_H
+#ifndef LUMIERA_VISITORPOLICIES_H
+#define LUMIERA_VISITORPOLICIES_H
 
 #include "common/error.hpp"
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace visitor
     {
@@ -65,7 +65,7 @@ namespace cinelerra
         RET 
         onUnknown (TAR&)
           {
-            throw cinelerra::error::Config("unable to decide what tool operation to call");
+            throw lumiera::error::Config("unable to decide what tool operation to call");
           }
       };
       
@@ -73,5 +73,5 @@ namespace cinelerra
     
   } // namespace visitor
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/src/lib/condition.c b/src/lib/condition.c
index 2b0bc28e8..7427b431d 100644
--- a/src/lib/condition.c
+++ b/src/lib/condition.c
@@ -30,8 +30,8 @@
  * @param self is a pointer to the condition variable to be initialized
  * @return self as given
  */
-CinelerraCondition
-cinelerra_condition_init (CinelerraCondition self)
+LumieraCondition
+lumiera_condition_init (LumieraCondition self)
 {
   if (self)
     {
@@ -47,15 +47,15 @@ cinelerra_condition_init (CinelerraCondition self)
  * @param self is a pointer to the condition variable to be destroyed
  * @return self as given
  */
-CinelerraCondition
-cinelerra_condition_destroy (CinelerraCondition self)
+LumieraCondition
+lumiera_condition_destroy (LumieraCondition self)
 {
   if (self)
     {
       if (pthread_mutex_destroy (&self->mutex))
-        CINELERRA_DIE;
+        LUMIERA_DIE;
       else if (pthread_cond_destroy (&self->cond))
-        CINELERRA_DIE;
+        LUMIERA_DIE;
     }
   return self;
 }
diff --git a/src/lib/condition.h b/src/lib/condition.h
index 73da3685f..b2fd76c63 100644
--- a/src/lib/condition.h
+++ b/src/lib/condition.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef CINELERRA_CONDITION_H
-#define CINELERRA_CONDITION_H
+#ifndef LUMIERA_CONDITION_H
+#define LUMIERA_CONDITION_H
 
 #include "lib/locking.h"
 
@@ -33,21 +33,21 @@
  * Condition variables.
  *
  */
-struct cinelerra_condition_struct
+struct lumiera_condition_struct
 {
   pthread_cond_t cond;
   pthread_mutex_t mutex;
 };
-typedef struct cinelerra_condition_struct cinelerra_condition;
-typedef cinelerra_condition* CinelerraCondition;
+typedef struct lumiera_condition_struct lumiera_condition;
+typedef lumiera_condition* LumieraCondition;
 
 
-CinelerraCondition
-cinelerra_condition_init (CinelerraCondition self);
+LumieraCondition
+lumiera_condition_init (LumieraCondition self);
 
 
-CinelerraCondition
-cinelerra_condition_destroy (CinelerraCondition self);
+LumieraCondition
+lumiera_condition_destroy (LumieraCondition self);
 
 
 /**
@@ -55,14 +55,14 @@ cinelerra_condition_destroy (CinelerraCondition self);
  * @param self condition variable to be signaled, must be given, all errors are fatal
  */
 static inline void
-cinelerra_condition_signal (CinelerraCondition self)
+lumiera_condition_signal (LumieraCondition self)
 {
   REQUIRE (self);
   if (pthread_mutex_lock (&self->mutex))
-    CINELERRA_DIE;
+    LUMIERA_DIE;
   pthread_cond_signal (&self->cond);
   if (pthread_mutex_unlock (&self->mutex))
-    CINELERRA_DIE;
+    LUMIERA_DIE;
 }
 
 /**
@@ -70,14 +70,14 @@ cinelerra_condition_signal (CinelerraCondition self)
  * @param self condition variable to be signaled, must be given, all errors are fatal
  */
 static inline void
-cinelerra_condition_broadcast (CinelerraCondition self)
+lumiera_condition_broadcast (LumieraCondition self)
 {
   REQUIRE (self);
   if (pthread_mutex_lock (&self->mutex))
-    CINELERRA_DIE;
+    LUMIERA_DIE;
   pthread_cond_broadcast (&self->cond);
   if (pthread_mutex_unlock (&self->mutex))
-    CINELERRA_DIE;
+    LUMIERA_DIE;
 }
 
 
@@ -87,44 +87,44 @@ cinelerra_condition_broadcast (CinelerraCondition self)
 /**
  * conditionacquirer used to manage the state of a condition variable.
  */
-struct cinelerra_conditionacquirer_struct
+struct lumiera_conditionacquirer_struct
 {
-  CinelerraCondition cond;
-  enum cinelerra_lockstate  state;
+  LumieraCondition cond;
+  enum lumiera_lockstate  state;
 };
-typedef struct cinelerra_conditionacquirer_struct cinelerra_conditionacquirer;
-typedef struct cinelerra_conditionacquirer_struct* CinelerraConditionacquirer;
+typedef struct lumiera_conditionacquirer_struct lumiera_conditionacquirer;
+typedef struct lumiera_conditionacquirer_struct* LumieraConditionacquirer;
 
 /* helper function for nobug */
 static inline void
-cinelerra_conditionacquirer_ensureunlocked (CinelerraConditionacquirer self)
+lumiera_conditionacquirer_ensureunlocked (LumieraConditionacquirer self)
 {
-  ENSURE (self->state == CINELERRA_UNLOCKED, "forgot to unlock the condition mutex");
+  ENSURE (self->state == LUMIERA_UNLOCKED, "forgot to unlock the condition mutex");
 }
 
 /* override with a macro to use the cleanup checker */
-#define cinelerra_conditionacquirer \
-cinelerra_conditionacquirer NOBUG_CLEANUP(cinelerra_conditionacquirer_ensureunlocked)
+#define lumiera_conditionacquirer \
+lumiera_conditionacquirer NOBUG_CLEANUP(lumiera_conditionacquirer_ensureunlocked)
 
 
 /**
  * initialize a conditionacquirer state
  * @param self conditionacquirer to be initialized, must be an automatic variable
  * @param cond associated condition variable
- * @param state initial state of the mutex, either CINELERRA_LOCKED or CINELERRA_UNLOCKED
+ * @param state initial state of the mutex, either LUMIERA_LOCKED or LUMIERA_UNLOCKED
  * @return self as given
  * errors are fatal
  */
-static inline CinelerraConditionacquirer
-cinelerra_conditionacquirer_init (CinelerraConditionacquirer self, CinelerraCondition cond, enum cinelerra_lockstate state)
+static inline LumieraConditionacquirer
+lumiera_conditionacquirer_init (LumieraConditionacquirer self, LumieraCondition cond, enum lumiera_lockstate state)
 {
   REQUIRE (self);
   REQUIRE (cond);
   self->cond = cond;
   self->state = state;
-  if (state == CINELERRA_LOCKED)
+  if (state == LUMIERA_LOCKED)
     if (pthread_mutex_lock (&cond->mutex))
-      CINELERRA_DIE;
+      LUMIERA_DIE;
 
   return self;
 }
@@ -135,15 +135,15 @@ cinelerra_conditionacquirer_init (CinelerraConditionacquirer self, CinelerraCond
  * @param self conditionacquirer associated with a condition variable
  */
 static inline void
-cinelerra_conditionacquirer_lock (CinelerraConditionacquirer self)
+lumiera_conditionacquirer_lock (LumieraConditionacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_UNLOCKED, "mutex already locked");
+  REQUIRE (self->state == LUMIERA_UNLOCKED, "mutex already locked");
 
   if (pthread_mutex_lock (&self->cond->mutex))
-    CINELERRA_DIE;
+    LUMIERA_DIE;
 
-  self->state = CINELERRA_LOCKED;
+  self->state = LUMIERA_LOCKED;
 }
 
 
@@ -153,10 +153,10 @@ cinelerra_conditionacquirer_lock (CinelerraConditionacquirer self)
  * @param self conditionacquirer associated with a condition variable
  */
 static inline void
-cinelerra_conditionacquirer_wait (CinelerraConditionacquirer self)
+lumiera_conditionacquirer_wait (LumieraConditionacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_LOCKED, "mutex must be locked");
+  REQUIRE (self->state == LUMIERA_LOCKED, "mutex must be locked");
   pthread_cond_wait (&self->cond->cond, &self->cond->mutex);
 }
 
@@ -167,13 +167,13 @@ cinelerra_conditionacquirer_wait (CinelerraConditionacquirer self)
  * @param self conditionacquirer associated with a condition variable
  */
 static inline int
-cinelerra_conditionacquirer_unlock (CinelerraConditionacquirer self)
+lumiera_conditionacquirer_unlock (LumieraConditionacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked");
+  REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked");
   if (pthread_mutex_unlock (&self->cond->mutex))
-    CINELERRA_DIE;
-  self->state = CINELERRA_UNLOCKED;
+    LUMIERA_DIE;
+  self->state = LUMIERA_UNLOCKED;
 }
 
 
@@ -182,10 +182,10 @@ cinelerra_conditionacquirer_unlock (CinelerraConditionacquirer self)
  * @param self conditionacquirer associated with the condition variable to be signaled
  */
 static inline void
-cinelerra_conditionacquirer_signal (CinelerraConditionacquirer self)
+lumiera_conditionacquirer_signal (LumieraConditionacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked");
+  REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked");
   pthread_cond_signal (&self->cond->cond);
 }
 
@@ -195,10 +195,10 @@ cinelerra_conditionacquirer_signal (CinelerraConditionacquirer self)
  * @param self conditionacquirer associated with the condition variable to be signaled
  */
 static inline int
-cinelerra_conditionacquirer_broadcast (CinelerraConditionacquirer self)
+lumiera_conditionacquirer_broadcast (LumieraConditionacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked");
+  REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked");
   pthread_cond_broadcast (&self->cond->cond);
 }
 
diff --git a/src/lib/error.c b/src/lib/error.c
index df881013b..81e24bad8 100644
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -1,5 +1,5 @@
 /*
-  error.c  -  Cinelerra Error handling
+  error.c  -  Lumiera Error handling
 
   Copyright (C)         Lumiera.org
     2008,               Christian Thaeter <ct@pipapo.org>
@@ -24,41 +24,41 @@
 #include "lib/error.h"
 
 /**
- * @file C Error handling in Cinelerra.
+ * @file C Error handling in Lumiera.
  */
 
 
 /*
   predefined errors
 */
-CINELERRA_ERROR_DEFINE (ERRNO, "errno");
+LUMIERA_ERROR_DEFINE (ERRNO, "errno");
 
 
 /* Thread local storage */
-static pthread_key_t cinelerra_error_tls;
-static pthread_once_t cinelerra_error_initialized = PTHREAD_ONCE_INIT;
+static pthread_key_t lumiera_error_tls;
+static pthread_once_t lumiera_error_initialized = PTHREAD_ONCE_INIT;
 
 static void
-cinelerra_error_tls_init (void)
+lumiera_error_tls_init (void)
 {
-  pthread_key_create (&cinelerra_error_tls, NULL);
+  pthread_key_create (&lumiera_error_tls, NULL);
 }
 
 /**
  * Set error state for the current thread.
  * If the error state of the current thread was cleared, then set it, else preserve the old state.
- * @param nerr name of the error with 'CINELERRA_ERROR_' prefix (example: CINELERRA_ERROR_NO_MEMORY)
+ * @param nerr name of the error with 'LUMIERA_ERROR_' prefix (example: LUMIERA_ERROR_NO_MEMORY)
  * @return old state, that is NULL for success, when the state was cleared and a pointer to a pending 
  * error when the error state was already set
  */
 const char*
-cinelerra_error_set (const char * nerr)
+lumiera_error_set (const char * nerr)
 {
-  pthread_once (&cinelerra_error_initialized, cinelerra_error_tls_init);
+  pthread_once (&lumiera_error_initialized, lumiera_error_tls_init);
 
-  const char* err = pthread_getspecific (cinelerra_error_tls);
+  const char* err = pthread_getspecific (lumiera_error_tls);
   if (!err)
-    pthread_setspecific (cinelerra_error_tls, nerr);
+    pthread_setspecific (lumiera_error_tls, nerr);
 
   return err;
 }
@@ -71,12 +71,12 @@ cinelerra_error_set (const char * nerr)
  * @return pointer to any pending error of this thread, NULL if no error is pending
  */
 const char*
-cinelerra_error ()
+lumiera_error ()
 {
-  pthread_once (&cinelerra_error_initialized, cinelerra_error_tls_init);
+  pthread_once (&lumiera_error_initialized, lumiera_error_tls_init);
 
-  const char* err = pthread_getspecific (cinelerra_error_tls);
+  const char* err = pthread_getspecific (lumiera_error_tls);
   if (err)
-    pthread_setspecific (cinelerra_error_tls, NULL);
+    pthread_setspecific (lumiera_error_tls, NULL);
   return err;
 }
diff --git a/src/lib/error.h b/src/lib/error.h
index 322487de1..24c73f0a5 100644
--- a/src/lib/error.h
+++ b/src/lib/error.h
@@ -1,5 +1,5 @@
 /*
-  error.h  -  Cinelerra Error handling
+  error.h  -  Lumiera Error handling
 
   Copyright (C)         Lumiera.org
     2008,               Christian Thaeter <ct@pipapo.org>
@@ -18,8 +18,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#ifndef CINELERRA_ERROR_H
-#define CINELERRA_ERROR_H
+#ifndef LUMIERA_ERROR_H
+#define LUMIERA_ERROR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,7 +31,7 @@ extern "C" {
 #include <stdlib.h>
 
 /**
- * @file C Error handling in Cinelerra, header.
+ * @file C Error handling in Lumiera, header.
  */
 
 
@@ -39,46 +39,46 @@ extern "C" {
  * Abort unconditionally with a 'Fatal Error!' message.
  * This macro is used whenever the program end up in a invalid state from which no runtime recovery is possible
  */
-#define CINELERRA_DIE do { NOBUG_ERROR(NOBUG_ON, "Fatal Error!"); abort(); } while(0)
+#define LUMIERA_DIE do { NOBUG_ERROR(NOBUG_ON, "Fatal Error!"); abort(); } while(0)
 
 /**
  * Forward declare an error constant.
  * This macro eases the error declaration in header files
- * @param err name of the error without the 'CINELERRA_ERROR_' prefix (example: NO_MEMORY)
+ * @param err name of the error without the 'LUMIERA_ERROR_' prefix (example: NO_MEMORY)
  */
-#define CINELERRA_ERROR_DECLARE(err) \
-extern const char* CINELERRA_ERROR_##err
+#define LUMIERA_ERROR_DECLARE(err) \
+extern const char* LUMIERA_ERROR_##err
 
 /**
  * Definition and initialization of an error constant.
  * This macro eases the error definition in implementation files
- * @param err name of the error without the 'CINELERRA_ERROR_' prefix (example: NO_MEMORY)
+ * @param err name of the error without the 'LUMIERA_ERROR_' prefix (example: NO_MEMORY)
  * @param msg message describing the error in plain english (example: "memory allocation failed")
  */
-#define CINELERRA_ERROR_DEFINE(err, msg) \
-const char* CINELERRA_ERROR_##err = "CINELERRA_ERROR_" #err ":" msg
+#define LUMIERA_ERROR_DEFINE(err, msg) \
+const char* LUMIERA_ERROR_##err = "LUMIERA_ERROR_" #err ":" msg
 
 /** Helper macro to raise an error for the current thread.
  * This macro eases setting an error. It adds NoBug logging support to the low level error handling.
  * @param flag NoBug flag describing the subsystem where the error was raised
- * @param err name of the error without the 'CINELERRA_ERROR_' prefix (example: NO_MEMORY)
+ * @param err name of the error without the 'LUMIERA_ERROR_' prefix (example: NO_MEMORY)
  */
-#define CINELERRA_ERROR_SET(flag, err)                          \
-(({ERROR (flag, "%s", strchr(CINELERRA_ERROR_##err, ':')+1);}), \
-cinelerra_error_set(CINELERRA_ERROR_##err))
+#define LUMIERA_ERROR_SET(flag, err)                          \
+(({ERROR (flag, "%s", strchr(LUMIERA_ERROR_##err, ':')+1);}), \
+lumiera_error_set(LUMIERA_ERROR_##err))
 
 const char*
-cinelerra_error_set (const char * err);
+lumiera_error_set (const char * err);
 
 const char*
-cinelerra_error ();
+lumiera_error ();
 
 /*
   predefined errors
 */
-CINELERRA_ERROR_DECLARE (ERRNO);
+LUMIERA_ERROR_DECLARE (ERRNO);
 
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-#endif /* CINELERRA_ERROR_H */
+#endif /* LUMIERA_ERROR_H */
diff --git a/src/lib/framerate.c b/src/lib/framerate.c
index 717bab4bb..d8a2fa830 100644
--- a/src/lib/framerate.c
+++ b/src/lib/framerate.c
@@ -26,5 +26,5 @@
  */
 
 
-CINELERRA_ERROR_DEFINE(FRAMERATE_ILLEGAL_TIME, "invalid time given");
-CINELERRA_ERROR_DEFINE(FRAMERATE_ILLEGAL_FRAME, "invalid frame given");
+LUMIERA_ERROR_DEFINE(FRAMERATE_ILLEGAL_TIME, "invalid time given");
+LUMIERA_ERROR_DEFINE(FRAMERATE_ILLEGAL_FRAME, "invalid frame given");
diff --git a/src/lib/framerate.h b/src/lib/framerate.h
index c7c9d2adc..6b050c86e 100644
--- a/src/lib/framerate.h
+++ b/src/lib/framerate.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef CINELERRA_FRAMERATE_H
-#define CINELERRA_FRAMERATE_H
+#ifndef LUMIERA_FRAMERATE_H
+#define LUMIERA_FRAMERATE_H
 
 #include <limits.h>
 
@@ -36,37 +36,37 @@
  * framerates are defined as a rational number
  * for example NTSC with 30000/1001fps
  */
-struct cinelerra_framerate_struct
+struct lumiera_framerate_struct
 {
   unsigned n; //numerator
   unsigned d; //denominator
 };
 
-typedef struct cinelerra_framerate_struct cinelerra_framerate;
-typedef cinelerra_framerate* CinelerraFramerate;
+typedef struct lumiera_framerate_struct lumiera_framerate;
+typedef lumiera_framerate* LumieraFramerate;
 
-typedef signed long cinelerra_framepos;
+typedef signed long lumiera_framepos;
 
-CINELERRA_ERROR_DECLARE(FRAMERATE_ILLEGAL_TIME);
-CINELERRA_ERROR_DECLARE(FRAMERATE_ILLEGAL_FRAME);
+LUMIERA_ERROR_DECLARE(FRAMERATE_ILLEGAL_TIME);
+LUMIERA_ERROR_DECLARE(FRAMERATE_ILLEGAL_FRAME);
 
-#define CINELERRA_FRAMEPOS_ERROR LONG_MIN
+#define LUMIERA_FRAMEPOS_ERROR LONG_MIN
 
 /**
  * Get the frame number of a given time at a given frame rate.
  * frame indexing starts with 1
  * @param framerate is a pointer to the framerate used, defined as rational number. Must be given.
- * @param time is a pointer to a cinelerra_time which shall be converted.
- * @return frame at the given time or CINELERRA_FRAMEPOS_ERROR on error.
+ * @param time is a pointer to a lumiera_time which shall be converted.
+ * @return frame at the given time or LUMIERA_FRAMEPOS_ERROR on error.
  */
-static inline cinelerra_framepos
-cinelerra_framerate_frame_get_time (const CinelerraFramerate framerate, CinelerraTime time)
+static inline lumiera_framepos
+lumiera_framerate_frame_get_time (const LumieraFramerate framerate, LumieraTime time)
 {
   REQUIRE (framerate);
   if (!time || time->tv_sec == (time_t)-1)
     {
-      cinelerra_error_set(CINELERRA_ERROR_FRAMERATE_ILLEGAL_TIME);
-      return CINELERRA_FRAMEPOS_ERROR;
+      lumiera_error_set(LUMIERA_ERROR_FRAMERATE_ILLEGAL_TIME);
+      return LUMIERA_FRAMEPOS_ERROR;
     }
 
   /* we add a magic microsecond for rounding, because of integer truncation frames may be calculated at most 1us earlier,
@@ -79,21 +79,21 @@ cinelerra_framerate_frame_get_time (const CinelerraFramerate framerate, Cinelerr
  * Get the start time for a frame.
  * frame indexing starts with 1
  * @param framerate is a pointer to the framerate used, defined as rational number. Must be given.
- * @param time is a pointer to a cinelerra_time which shall take the result.
+ * @param time is a pointer to a lumiera_time which shall take the result.
  * @param frame frame number to be converted to time. This frame number must be greater than 0.
  * @return the pointer given in time or NULL on error (or when it was given as time).
  */
-static inline CinelerraTime
-cinelerra_framerate_time_get_time_frame (const CinelerraFramerate framerate,
-                                         CinelerraTime time,
-                                         cinelerra_framepos frame)
+static inline LumieraTime
+lumiera_framerate_time_get_time_frame (const LumieraFramerate framerate,
+                                       LumieraTime time,
+                                       lumiera_framepos frame)
 {
   REQUIRE (framerate);
   if (time)
     {
       if (frame < 1)
         {
-          cinelerra_error_set(CINELERRA_ERROR_FRAMERATE_ILLEGAL_FRAME);
+          lumiera_error_set(LUMIERA_ERROR_FRAMERATE_ILLEGAL_FRAME);
           return NULL;
         }
 
diff --git a/src/lib/locking.h b/src/lib/locking.h
index 2cf7f3700..01ad8bb29 100644
--- a/src/lib/locking.h
+++ b/src/lib/locking.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef CINELERRA_LOCKING_H
-#define CINELERRA_LOCKING_H
+#ifndef LUMIERA_LOCKING_H
+#define LUMIERA_LOCKING_H
 
 #include <pthread.h>
 #include <errno.h>
@@ -37,12 +37,12 @@
  *
  *
  */
-enum cinelerra_lockstate
+enum lumiera_lockstate
   {
-    CINELERRA_UNLOCKED,
-    CINELERRA_LOCKED,
-    CINELERRA_RDLOCKED,
-    CINELERRA_WRLOCKED
+    LUMIERA_UNLOCKED,
+    LUMIERA_LOCKED,
+    LUMIERA_RDLOCKED,
+    LUMIERA_WRLOCKED
   };
 
 #endif
diff --git a/src/lib/mutex.c b/src/lib/mutex.c
index b644c00ca..a08d89e51 100644
--- a/src/lib/mutex.c
+++ b/src/lib/mutex.c
@@ -31,8 +31,8 @@
  * @param self is a pointer to the mutex to be initialized
  * @return self as given
  */
-CinelerraMutex
-cinelerra_mutex_init (CinelerraMutex self)
+LumieraMutex
+lumiera_mutex_init (LumieraMutex self)
 {
   if (self)
     {
@@ -46,13 +46,13 @@ cinelerra_mutex_init (CinelerraMutex self)
  * @param self is a pointer to the mutex to be destroyed
  * @return self as given
  */
-CinelerraMutex
-cinelerra_mutex_destroy (CinelerraMutex self)
+LumieraMutex
+lumiera_mutex_destroy (LumieraMutex self)
 {
   if (self)
     {
       if (pthread_mutex_destroy (&self->mutex))
-        CINELERRA_DIE;
+        LUMIERA_DIE;
     }
   return self;
 }
diff --git a/src/lib/mutex.h b/src/lib/mutex.h
index 4dc4bac92..ced7118e2 100644
--- a/src/lib/mutex.h
+++ b/src/lib/mutex.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef CINELERRA_MUTEX_H
-#define CINELERRA_MUTEX_H
+#ifndef LUMIERA_MUTEX_H
+#define LUMIERA_MUTEX_H
 
 #include "lib/locking.h"
 
@@ -33,58 +33,58 @@
  * Mutex.
  *
  */
-struct cinelerra_mutex_struct
+struct lumiera_mutex_struct
 {
   pthread_mutex_t mutex;
 };
-typedef struct cinelerra_mutex_struct cinelerra_mutex;
-typedef cinelerra_mutex* CinelerraMutex;
+typedef struct lumiera_mutex_struct lumiera_mutex;
+typedef lumiera_mutex* LumieraMutex;
 
 
-CinelerraMutex
-cinelerra_mutex_init (CinelerraMutex self);
+LumieraMutex
+lumiera_mutex_init (LumieraMutex self);
 
 
-CinelerraMutex
-cinelerra_mutex_destroy (CinelerraMutex self);
+LumieraMutex
+lumiera_mutex_destroy (LumieraMutex self);
 
 
 
 /**
  * mutexacquirer used to manage the state of a mutex variable.
  */
-struct cinelerra_mutexacquirer_struct
+struct lumiera_mutexacquirer_struct
 {
-  CinelerraMutex mutex;
-  enum cinelerra_lockstate  state;
+  LumieraMutex mutex;
+  enum lumiera_lockstate  state;
 };
-typedef struct cinelerra_mutexacquirer_struct cinelerra_mutexacquirer;
-typedef struct cinelerra_mutexacquirer_struct* CinelerraMutexacquirer;
+typedef struct lumiera_mutexacquirer_struct lumiera_mutexacquirer;
+typedef struct lumiera_mutexacquirer_struct* LumieraMutexacquirer;
 
 /* helper function for nobug */
 static inline void
-cinelerra_mutexacquirer_ensureunlocked (CinelerraMutexacquirer self)
+lumiera_mutexacquirer_ensureunlocked (LumieraMutexacquirer self)
 {
-  ENSURE (self->state == CINELERRA_UNLOCKED, "forgot to unlock mutex");
+  ENSURE (self->state == LUMIERA_UNLOCKED, "forgot to unlock mutex");
 }
 
 /* override with a macro to use the cleanup checker */
-#define cinelerra_mutexacquirer \
-cinelerra_mutexacquirer NOBUG_CLEANUP(cinelerra_mutexacquirer_ensureunlocked)
+#define lumiera_mutexacquirer \
+lumiera_mutexacquirer NOBUG_CLEANUP(lumiera_mutexacquirer_ensureunlocked)
 
 
 /**
  * initialize a mutexacquirer state without mutex.
  * @param self mutexacquirer to be initialized, must be an automatic variable
  * @return self as given
- * This initialization is used when cinelerra_mutexacquirer_try_mutex shall be used later
+ * This initialization is used when lumiera_mutexacquirer_try_mutex shall be used later
  */
-static inline CinelerraMutexacquirer
-cinelerra_mutexacquirer_init (CinelerraMutexacquirer self)
+static inline LumieraMutexacquirer
+lumiera_mutexacquirer_init (LumieraMutexacquirer self)
 {
   REQUIRE (self);
   self->mutex = NULL;
-  self->state = CINELERRA_UNLOCKED;
+  self->state = LUMIERA_UNLOCKED;
 
   return self;
 }
@@ -93,20 +93,20 @@ cinelerra_mutexacquirer_init (CinelerraMutexacquirer self)
  * initialize a mutexacquirer state
  * @param self mutexacquirer to be initialized, must be an automatic variable
  * @param mutex associated mutex
- * @param state initial state of the mutex, either CINELERRA_LOCKED or CINELERRA_UNLOCKED
+ * @param state initial state of the mutex, either LUMIERA_LOCKED or LUMIERA_UNLOCKED
  * @return self as given
  * errors are fatal
  */
-static inline CinelerraMutexacquirer
-cinelerra_mutexacquirer_init_mutex (CinelerraMutexacquirer self, CinelerraMutex mutex, enum cinelerra_lockstate state)
+static inline LumieraMutexacquirer
+lumiera_mutexacquirer_init_mutex (LumieraMutexacquirer self, LumieraMutex mutex, enum lumiera_lockstate state)
 {
   REQUIRE (self);
   REQUIRE (mutex);
   self->mutex = mutex;
   self->state = state;
-  if (state == CINELERRA_LOCKED)
+  if (state == LUMIERA_LOCKED)
     if (pthread_mutex_lock (&mutex->mutex))
-      CINELERRA_DIE;
+      LUMIERA_DIE;
 
   return self;
 }
@@ -118,25 +118,25 @@ cinelerra_mutexacquirer_init_mutex (CinelerraMutexacquirer self, CinelerraMutex
  * @param self mutexacquirer associated with a mutex variable
  */
 static inline void
-cinelerra_mutexacquirer_lock (CinelerraMutexacquirer self)
+lumiera_mutexacquirer_lock (LumieraMutexacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_UNLOCKED, "mutex already locked");
+  REQUIRE (self->state == LUMIERA_UNLOCKED, "mutex already locked");
 
   if (pthread_mutex_lock (&self->mutex->mutex))
-    CINELERRA_DIE;
+    LUMIERA_DIE;
 
-  self->state = CINELERRA_LOCKED;
+  self->state = LUMIERA_LOCKED;
 }
 
 
 /**
  * get the state of a lock.
  * @param self mutexacquirer associated with a mutex variable
- * @return CINELERRA_LOCKED when the mutex is locked by this thead
+ * @return LUMIERA_LOCKED when the mutex is locked by this thead
  */
-static inline enum cinelerra_lockstate
-cinelerra_mutexacquirer_state (CinelerraMutexacquirer self)
+static inline enum lumiera_lockstate
+lumiera_mutexacquirer_state (LumieraMutexacquirer self)
 {
   REQUIRE (self);
   return self->state;
@@ -148,23 +148,23 @@ cinelerra_mutexacquirer_state (CinelerraMutexacquirer self)
  * must not already be locked
  * @param self mutexacquirer associated with a mutex variable
  * @param mutex pointer to a mutex which should be tried
- * @return CINELERRA_LOCKED when the mutex got locked
+ * @return LUMIERA_LOCKED when the mutex got locked
  */
-static inline enum cinelerra_lockstate
-cinelerra_mutexacquirer_try_mutex (CinelerraMutexacquirer self, CinelerraMutex mutex)
+static inline enum lumiera_lockstate
+lumiera_mutexacquirer_try_mutex (LumieraMutexacquirer self, LumieraMutex mutex)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_UNLOCKED, "mutex already locked");
+  REQUIRE (self->state == LUMIERA_UNLOCKED, "mutex already locked");
 
   self->mutex=mutex;
   switch (pthread_mutex_trylock (&self->mutex->mutex))
     {
     case 0:
-      return self->state = CINELERRA_LOCKED;
+      return self->state = LUMIERA_LOCKED;
     case EBUSY:
-      return CINELERRA_UNLOCKED;
+      return LUMIERA_UNLOCKED;
     default:
-      CINELERRA_DIE;
+      LUMIERA_DIE;
     }
 }
 
@@ -175,13 +175,13 @@ cinelerra_mutexacquirer_try_mutex (CinelerraMutexacquirer self, CinelerraMutex m
  * @param self mutexacquirer associated with a mutex variable
  */
 static inline void
-cinelerra_mutexacquirer_unlock (CinelerraMutexacquirer self)
+lumiera_mutexacquirer_unlock (LumieraMutexacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_LOCKED, "mutex was not locked");
+  REQUIRE (self->state == LUMIERA_LOCKED, "mutex was not locked");
   if (pthread_mutex_unlock (&self->mutex->mutex))
-    CINELERRA_DIE;
-  self->state = CINELERRA_UNLOCKED;
+    LUMIERA_DIE;
+  self->state = LUMIERA_UNLOCKED;
 }
 
 #endif
diff --git a/src/lib/plugin.c b/src/lib/plugin.c
index f819f4a6a..87939533d 100644
--- a/src/lib/plugin.c
+++ b/src/lib/plugin.c
@@ -1,5 +1,5 @@
 /*
-  plugin.c  -  Cinelerra Plugin loader
+  plugin.c  -  Lumiera Plugin loader
 
   Copyright (C)         Lumiera.org
     2008,               Christian Thaeter <ct@pipapo.org>
@@ -34,48 +34,48 @@
 
 
 /* TODO should be set by the build system to the actual plugin path */
-#define CINELERRA_PLUGIN_PATH "~/.cinelerra3/plugins:/usr/local/lib/cinelerra3/plugins:.libs"
+#define LUMIERA_PLUGIN_PATH "~/.lumiera/plugins:/usr/local/lib/lumiera/plugins:.libs"
 
-NOBUG_DEFINE_FLAG (cinelerra_plugin);
+NOBUG_DEFINE_FLAG (lumiera_plugin);
 
 /* errors */
-CINELERRA_ERROR_DEFINE(PLUGIN_DLOPEN, "Could not open plugin");
-CINELERRA_ERROR_DEFINE(PLUGIN_HOOK, "Hook function failed");
-CINELERRA_ERROR_DEFINE(PLUGIN_NFILE, "No such plugin");
-CINELERRA_ERROR_DEFINE(PLUGIN_NIFACE, "No such interface");
-CINELERRA_ERROR_DEFINE(PLUGIN_REVISION, "Interface revision too old");
+LUMIERA_ERROR_DEFINE(PLUGIN_DLOPEN, "Could not open plugin");
+LUMIERA_ERROR_DEFINE(PLUGIN_HOOK, "Hook function failed");
+LUMIERA_ERROR_DEFINE(PLUGIN_NFILE, "No such plugin");
+LUMIERA_ERROR_DEFINE(PLUGIN_NIFACE, "No such interface");
+LUMIERA_ERROR_DEFINE(PLUGIN_REVISION, "Interface revision too old");
 
 /*
   supported (planned) plugin types and their file extensions
 */
 
-enum cinelerra_plugin_type
+enum lumiera_plugin_type
   {
-    CINELERRA_PLUGIN_NULL,
-    CINELERRA_PLUGIN_DYNLIB,
-    CINELERRA_PLUGIN_CSOURCE
+    LUMIERA_PLUGIN_NULL,
+    LUMIERA_PLUGIN_DYNLIB,
+    LUMIERA_PLUGIN_CSOURCE
   };
 
 static const struct
 {
   const char* const ext;
-  enum cinelerra_plugin_type type;
-} cinelerra_plugin_extensions [] =
+  enum lumiera_plugin_type type;
+} lumiera_plugin_extensions [] =
   {
-    {"so",       CINELERRA_PLUGIN_DYNLIB},
-    {"o",        CINELERRA_PLUGIN_DYNLIB},
-    {"c",        CINELERRA_PLUGIN_CSOURCE},
+    {"so",       LUMIERA_PLUGIN_DYNLIB},
+    {"o",        LUMIERA_PLUGIN_DYNLIB},
+    {"c",        LUMIERA_PLUGIN_CSOURCE},
     /* extend here */
-    {NULL,       CINELERRA_PLUGIN_NULL}
+    {NULL,       LUMIERA_PLUGIN_NULL}
   };
 
 
-struct cinelerra_plugin
+struct lumiera_plugin
 {
   /* short name as queried ("effects/audio/normalize") used for sorting/finding */
   const char* name;
 
-  /* long names as looked up ("/usr/local/lib/cinelerra3/plugins/effects/audio/normalize.so") */
+  /* long names as looked up ("/usr/local/lib/lumiera/plugins/effects/audio/normalize.so") */
   const char* pathname;
 
   /* use count for all interfaces of this plugin */
@@ -85,7 +85,7 @@ struct cinelerra_plugin
   time_t last;
 
   /* kind of plugin */
-  enum cinelerra_plugin_type type;
+  enum lumiera_plugin_type type;
 
   /* dlopen handle */
   void* handle;
@@ -93,19 +93,19 @@ struct cinelerra_plugin
 
 
 /* global plugin registry */
-void* cinelerra_plugin_registry = NULL;
+void* lumiera_plugin_registry = NULL;
 
 /* plugin operations are protected by one big mutex */
-pthread_mutex_t cinelerra_plugin_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t lumiera_plugin_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /**
  * the compare function for the registry tree.
- * Compares the names of two struct cinelerra_plugin.
+ * Compares the names of two struct lumiera_plugin.
  * @return 0 if a and b are equal, just like strcmp. */
 static int
-cinelerra_plugin_name_cmp (const void* a, const void* b)
+lumiera_plugin_name_cmp (const void* a, const void* b)
 {
-  return strcmp (((struct cinelerra_plugin*) a)->name, ((struct cinelerra_plugin*) b)->name);
+  return strcmp (((struct lumiera_plugin*) a)->name, ((struct lumiera_plugin*) b)->name);
 }
 
 /**
@@ -113,21 +113,21 @@ cinelerra_plugin_name_cmp (const void* a, const void* b)
  * always succeeds or aborts
  */
 void
-cinelerra_init_plugin (void)
+lumiera_init_plugin (void)
 {
-  NOBUG_INIT_FLAG (cinelerra_plugin);
+  NOBUG_INIT_FLAG (lumiera_plugin);
 }
 
 /**
  * Find and set pathname for the plugin.
  * Searches through given path for given plugin, trying to find the file's location in the filesystem.
  * If found, self->pathname will be set to the found plugin file.
- * @param self The cinelerra_plugin to open look for.
+ * @param self The lumiera_plugin to open look for.
  * @param path The path to search trough (paths seperated by ":")
  * @return 0 on success. -1 on error, or if plugin not found in path.
  */
 int
-cinelerra_plugin_lookup (struct cinelerra_plugin* self, const char* path)
+lumiera_plugin_lookup (struct lumiera_plugin* self, const char* path)
 {
   if (!path)
     return -1;
@@ -146,22 +146,22 @@ cinelerra_plugin_lookup (struct cinelerra_plugin* self, const char* path)
   for (char* tok = strtok_r (tpath, ":", &tmp); tok; tok = strtok_r (NULL, ":", &tmp))
     {
       /*for each extension*/
-      for (int i = 0; cinelerra_plugin_extensions[i].ext; ++i)
+      for (int i = 0; lumiera_plugin_extensions[i].ext; ++i)
         {
           /* path/name.extension */
-          int r = snprintf(pathname, 1024, "%s/%s.%s", tok, self->name, cinelerra_plugin_extensions[i].ext);
+          int r = snprintf(pathname, 1024, "%s/%s.%s", tok, self->name, lumiera_plugin_extensions[i].ext);
           if (r >= 1024)
             return -1; /*TODO error handling, name too long*/
 
-          TRACE (cinelerra_plugin, "trying %s", pathname);
+          TRACE (lumiera_plugin, "trying %s", pathname);
 
           if (!access(pathname, R_OK))
             {
               /* got it */
-              TRACE (cinelerra_plugin, "found %s", pathname);
+              TRACE (lumiera_plugin, "found %s", pathname);
               self->pathname = strdup (pathname);
-              if (!self->pathname) CINELERRA_DIE;
-              self->type = cinelerra_plugin_extensions[i].type;
+              if (!self->pathname) LUMIERA_DIE;
+              self->type = lumiera_plugin_extensions[i].type;
               return 0;
             }
         }
@@ -181,44 +181,44 @@ cinelerra_plugin_lookup (struct cinelerra_plugin* self, const char* path)
  * @return handle to the interface or NULL in case of a error. The application shall cast this handle to
  * the actual interface type.
  */
-struct cinelerra_interface*
-cinelerra_interface_open (const char* name, const char* interface, size_t min_revision)
+struct lumiera_interface*
+lumiera_interface_open (const char* name, const char* interface, size_t min_revision)
 {
-  //REQUIRE (min_revision > sizeof(struct cinelerra_interface), "try to use an empty interface eh?");
+  //REQUIRE (min_revision > sizeof(struct lumiera_interface), "try to use an empty interface eh?");
   REQUIRE (interface, "interface name must be given");
 
-  pthread_mutex_lock (&cinelerra_plugin_mutex);
+  pthread_mutex_lock (&lumiera_plugin_mutex);
 
-  struct cinelerra_plugin plugin;
-  struct cinelerra_plugin** found;
+  struct lumiera_plugin plugin;
+  struct lumiera_plugin** found;
 
   plugin.name = name; /* for searching */
 
-  found = tsearch (&plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp);
-  if (!found) CINELERRA_DIE;
+  found = tsearch (&plugin, &lumiera_plugin_registry, lumiera_plugin_name_cmp);
+  if (!found) LUMIERA_DIE;
 
   if (*found == &plugin)
     {
-      NOTICE (cinelerra_plugin, "new plugin");
+      NOTICE (lumiera_plugin, "new plugin");
 
       /* now really create new item */
-      *found = malloc (sizeof (struct cinelerra_plugin));
-      if (!*found) CINELERRA_DIE;
+      *found = malloc (sizeof (struct lumiera_plugin));
+      if (!*found) LUMIERA_DIE;
 
       if (name) /* NULL is main app, no lookup needed */
         {
-          /*lookup for $CINELERRA_PLUGIN_PATH*/
+          /*lookup for $LUMIERA_PLUGIN_PATH*/
           (*found)->name = strdup (name);
-          if (!(*found)->name) CINELERRA_DIE;
+          if (!(*found)->name) LUMIERA_DIE;
 
-          if (!!cinelerra_plugin_lookup (*found, getenv("CINELERRA_PLUGIN_PATH"))
-#ifdef CINELERRA_PLUGIN_PATH
-              /* else lookup for -DCINELERRA_PLUGIN_PATH */
-              && !!cinelerra_plugin_lookup (*found, CINELERRA_PLUGIN_PATH)
+          if (!!lumiera_plugin_lookup (*found, getenv("LUMIERA_PLUGIN_PATH"))
+#ifdef LUMIERA_PLUGIN_PATH
+              /* else lookup for -DLUMIERA_PLUGIN_PATH */
+              && !!lumiera_plugin_lookup (*found, LUMIERA_PLUGIN_PATH)
 #endif
               )
             {
-              CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_NFILE);
+              LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_NFILE);
               goto elookup;
             }
         }
@@ -233,46 +233,46 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re
       PLANNED("if .so like then dlopen; else if .c like tcc compile");
       TODO("factor dlopen and dlsym out");
 
-      TRACE(cinelerra_plugin, "trying to open %s", (*found)->pathname);
+      TRACE(lumiera_plugin, "trying to open %s", (*found)->pathname);
 
       (*found)->handle = dlopen ((*found)->pathname, RTLD_LAZY|RTLD_LOCAL);
       if (!(*found)->handle)
         {
-          ERROR (cinelerra_plugin, "dlopen failed: %s", dlerror());
-          CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_DLOPEN);
+          ERROR (lumiera_plugin, "dlopen failed: %s", dlerror());
+          LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_DLOPEN);
           goto edlopen;
         }
 
-      /* if the plugin defines a 'cinelerra_plugin_init' function, we call it, must return 0 on success */
-      int (*init)(void) = dlsym((*found)->handle, "cinelerra_plugin_init");
+      /* if the plugin defines a 'lumiera_plugin_init' function, we call it, must return 0 on success */
+      int (*init)(void) = dlsym((*found)->handle, "lumiera_plugin_init");
       if (init && init())
         {
-          //ERROR (cinelerra_plugin, "cinelerra_plugin_init failed: %s: %s", name, interface);
-          CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_HOOK);
+          //ERROR (lumiera_plugin, "lumiera_plugin_init failed: %s: %s", name, interface);
+          LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_HOOK);
           goto einit;
         }
     }
   /* we have the plugin, now get the interface descriptor */
-  struct cinelerra_interface* ret;
+  struct lumiera_interface* ret;
 
   dlerror();
   ret = dlsym ((*found)->handle, interface);
 
   const char *dlerr = dlerror();
-  TRACE(cinelerra_plugin, "%s", dlerr);
-  TODO ("need some way to tell 'interface not provided by plugin', maybe cinelerra_plugin_error()?");
+  TRACE(lumiera_plugin, "%s", dlerr);
+  TODO ("need some way to tell 'interface not provided by plugin', maybe lumiera_plugin_error()?");
   if (dlerr)
     {
-      //ERROR (cinelerra_plugin, "plugin %s doesnt provide interface %s", name, interface);
-      CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_NIFACE);
+      //ERROR (lumiera_plugin, "plugin %s doesnt provide interface %s", name, interface);
+      LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_NIFACE);
       goto edlsym;
     }
 
   /* is the interface older than required? */
   if (ret->size < min_revision)
     {
-      ERROR (cinelerra_plugin, "plugin %s provides older interface %s revision than required", name, interface);
-      CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_REVISION);
+      ERROR (lumiera_plugin, "plugin %s provides older interface %s revision than required", name, interface);
+      LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_REVISION);
       goto erevision;
     }
 
@@ -281,8 +281,8 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re
   /* if the interface provides a 'open' function, call it now, must return 0 on success */
   if (ret->open && ret->open())
     {
-      ERROR (cinelerra_plugin, "open hook indicated an error");
-      CINELERRA_ERROR_SET (cinelerra_plugin, PLUGIN_HOOK);
+      ERROR (lumiera_plugin, "open hook indicated an error");
+      LUMIERA_ERROR_SET (lumiera_plugin, PLUGIN_HOOK);
       goto eopen;
     }
 
@@ -290,7 +290,7 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re
   (*found)->last = time (NULL);
   ret->use_count++;
 
-  pthread_mutex_unlock (&cinelerra_plugin_mutex);
+  pthread_mutex_unlock (&lumiera_plugin_mutex);
   return ret;
 
   /* Error cleanup */
@@ -304,8 +304,8 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re
   free ((char*)(*found)->name);
   free (*found);
   *found = &plugin;
-  tdelete (&plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp);
-  pthread_mutex_unlock (&cinelerra_plugin_mutex);
+  tdelete (&plugin, &lumiera_plugin_registry, lumiera_plugin_name_cmp);
+  pthread_mutex_unlock (&lumiera_plugin_mutex);
   return NULL;
 }
 
@@ -315,17 +315,17 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re
  * @param ptr interface to be closed
  */
 void
-cinelerra_interface_close (void* ptr)
+lumiera_interface_close (void* ptr)
 {
-  TRACE (cinelerra_plugin, "%p", ptr);
+  TRACE (lumiera_plugin, "%p", ptr);
   if(!ptr)
     return;
 
-  struct cinelerra_interface* self = (struct cinelerra_interface*) ptr;
+  struct lumiera_interface* self = (struct lumiera_interface*) ptr;
 
-  pthread_mutex_lock (&cinelerra_plugin_mutex);
+  pthread_mutex_lock (&lumiera_plugin_mutex);
 
-  struct cinelerra_plugin* plugin = self->plugin;
+  struct lumiera_plugin* plugin = self->plugin;
   
   plugin->use_count--;
   self->use_count--;
@@ -339,16 +339,16 @@ cinelerra_interface_close (void* ptr)
     {
       TODO ("we dont want to close here, instead store time of recent use and make a expire run, already planned in my head");
 
-      /* if the plugin defines a 'cinelerra_plugin_destroy' function, we call it */
-      int (*destroy)(void) = dlsym(plugin->handle, "cinelerra_plugin_destroy");
+      /* if the plugin defines a 'lumiera_plugin_destroy' function, we call it */
+      int (*destroy)(void) = dlsym(plugin->handle, "lumiera_plugin_destroy");
       if (destroy)
         destroy();
 
       /* and now cleanup */
-      tdelete (plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp);
+      tdelete (plugin, &lumiera_plugin_registry, lumiera_plugin_name_cmp);
       free ((char*)plugin->name);
       dlclose(plugin->handle);
       free (plugin);
     }
-  pthread_mutex_unlock (&cinelerra_plugin_mutex);
+  pthread_mutex_unlock (&lumiera_plugin_mutex);
 }
diff --git a/src/lib/plugin.h b/src/lib/plugin.h
index 45a22bf29..f8916ae96 100644
--- a/src/lib/plugin.h
+++ b/src/lib/plugin.h
@@ -18,8 +18,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#ifndef CINELERRA_PLUGIN_H
-#define CINELERRA_PLUGIN_H
+#ifndef LUMIERA_PLUGIN_H
+#define LUMIERA_PLUGIN_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,55 +37,55 @@ extern "C" {
  */
 
 
-NOBUG_DECLARE_FLAG (cinelerra_plugin);
+NOBUG_DECLARE_FLAG (lumiera_plugin);
 
 /* tool macros*/
-#define CINELERRA_INTERFACE_TYPE(name, version) struct cinelerra_interface_##name##_##version
-#define CINELERRA_INTERFACE_CAST(name, version) (CINELERRA_INTERFACE_TYPE(name, version)*)
+#define LUMIERA_INTERFACE_TYPE(name, version) struct lumiera_interface_##name##_##version
+#define LUMIERA_INTERFACE_CAST(name, version) (LUMIERA_INTERFACE_TYPE(name, version)*)
 
 /* Interface definition */
-#define CINELERRA_INTERFACE(name, version, ...) \
-CINELERRA_INTERFACE_TYPE(name, version)         \
+#define LUMIERA_INTERFACE(name, version, ...)   \
+LUMIERA_INTERFACE_TYPE(name, version)           \
 {                                               \
-  struct cinelerra_interface interface_header_; \
+  struct lumiera_interface interface_header_; \
   __VA_ARGS__                                   \
 }
 
-#define CINELERRA_INTERFACE_PROTO(ret, name, params)  ret (*name) params;
+#define LUMIERA_INTERFACE_PROTO(ret, name, params)  ret (*name) params;
 
 /* Interface instantiation */
-#define CINELERRA_INTERFACE_IMPLEMENT(iname, version, name, open, close, ...)   \
-CINELERRA_INTERFACE_TYPE(iname, version) name##_##version =                     \
-{                                                                               \
-  {                                                                             \
-    version,                                                                    \
-    sizeof(CINELERRA_INTERFACE_TYPE(iname, version)),                           \
-    NULL,                                                                       \
-    0,                                                                          \
-    open,                                                                       \
-    close                                                                       \
-  },                                                                            \
-  __VA_ARGS__                                                                   \
+#define LUMIERA_INTERFACE_IMPLEMENT(iname, version, name, open, close, ...)  \
+LUMIERA_INTERFACE_TYPE(iname, version) name##_##version =                    \
+{                                                                            \
+  {                                                                          \
+    version,                                                                 \
+    sizeof(LUMIERA_INTERFACE_TYPE(iname, version)),                          \
+    NULL,                                                                    \
+    0,                                                                       \
+    open,                                                                    \
+    close                                                                    \
+  },                                                                         \
+  __VA_ARGS__                                                                \
 }
 
 
 
 /* internally used */
-struct cinelerra_plugin;
+struct lumiera_plugin;
 
 /**
  * This is the header for any interface exported by plugins.
  * Real interfaces append their functions at the end. There are few standard functions on each Interface
  * Every function is required to be implemnted.
  */
-struct cinelerra_interface
+struct lumiera_interface
 {
   /// interface version number
   unsigned version;
   /// size of the full structure is used to determine the revision (adding a new function increments the size)
   size_t size;
   /// back reference to plugin
-  struct cinelerra_plugin* plugin;
+  struct lumiera_plugin* plugin;
   /// incremented for each user of this interface and decremented when closed
   unsigned use_count;
 
@@ -96,15 +96,15 @@ struct cinelerra_interface
 };
 
 void
-cinelerra_init_plugin (void);
+lumiera_init_plugin (void);
 
 
-struct cinelerra_interface*
-cinelerra_interface_open (const char* plugin, const char* name, size_t min_revision);
+struct lumiera_interface*
+lumiera_interface_open (const char* plugin, const char* name, size_t min_revision);
 
 
 void
-cinelerra_interface_close (void* self);
+lumiera_interface_close (void* self);
 
 /**
  * Tries to unload a plugin.
@@ -113,24 +113,24 @@ cinelerra_interface_close (void* self);
  * @return 0 on success, else the number if users which keeping the plugin loaded
  */
 int
-cinelerra_plugin_unload (const char* plugin);
+lumiera_plugin_unload (const char* plugin);
 
 /**
  * Tries to unload plugins which are not in use.
- * Calls cinelerra_plugin_unload() for each Plugin which is not used for more than age seconds.
+ * Calls lumiera_plugin_unload() for each Plugin which is not used for more than age seconds.
  * This function might be infrequently called by the scheduler to remove things which are not needed.
  * @param age timeout in seconds when to unload plugins
  */
 void
-cinelerra_plugin_expire (time_t age);
+lumiera_plugin_expire (time_t age);
 
-CINELERRA_ERROR_DECLARE(PLUGIN_DLOPEN);
-CINELERRA_ERROR_DECLARE(PLUGIN_HOOK);
-CINELERRA_ERROR_DECLARE(PLUGIN_NFILE);
-CINELERRA_ERROR_DECLARE(PLUGIN_NIFACE);
-CINELERRA_ERROR_DECLARE(PLUGIN_REVISION);
+LUMIERA_ERROR_DECLARE(PLUGIN_DLOPEN);
+LUMIERA_ERROR_DECLARE(PLUGIN_HOOK);
+LUMIERA_ERROR_DECLARE(PLUGIN_NFILE);
+LUMIERA_ERROR_DECLARE(PLUGIN_NIFACE);
+LUMIERA_ERROR_DECLARE(PLUGIN_REVISION);
 
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-#endif /* CINELERRA_PLUGIN_H */
+#endif /* LUMIERA_PLUGIN_H */
diff --git a/src/lib/references.c b/src/lib/references.c
index a4c5eb247..ad4f9562f 100644
--- a/src/lib/references.c
+++ b/src/lib/references.c
@@ -40,17 +40,17 @@
  * @param dtor destructor function which will be called on obj when the last strong reference gets deleted
  * @return self as given
  */
-CinelerraReference
-cinelerra_reference_strong_init_once (CinelerraReference self, void* obj, void (*dtor)(void*))
+LumieraReference
+lumiera_reference_strong_init_once (LumieraReference self, void* obj, void (*dtor)(void*))
 {
-  CinelerraReftarget target = malloc (sizeof(cinelerra_reftarget));
-  if (!target) CINELERRA_DIE;
+  LumieraReftarget target = malloc (sizeof(lumiera_reftarget));
+  if (!target) LUMIERA_DIE;
 
   target->object = obj;
   target->dtor = dtor;
   target->strong_cnt = 1;
   target->weak_cnt = 0;
-  cinelerra_mutex_init (&target->lock);
+  lumiera_mutex_init (&target->lock);
 
   self->object = obj;
   self->target = target;
@@ -66,16 +66,16 @@ cinelerra_reference_strong_init_once (CinelerraReference self, void* obj, void (
  * @return self as given
  * destroying a reference is not thread safe as far as 2 threads try to concurrently destroy it!
  */
-CinelerraReference
-cinelerra_reference_destroy (CinelerraReference self)
+LumieraReference
+lumiera_reference_destroy (LumieraReference self)
 {
-  CinelerraReftarget target = self->target;
+  LumieraReftarget target = self->target;
 
   /* defensive, lets detect errors if anything still tries to use this reference */
   self->target = NULL;
 
-  cinelerra_mutexacquirer lock;
-  cinelerra_mutexacquirer_init_mutex (&lock, &target->lock, CINELERRA_LOCKED);
+  lumiera_mutexacquirer lock;
+  lumiera_mutexacquirer_init_mutex (&lock, &target->lock, LUMIERA_LOCKED);
 
   if (self->object)
     {
@@ -89,8 +89,8 @@ cinelerra_reference_destroy (CinelerraReference self)
           if (!target->weak_cnt)
             {
               /* no weak refs either, destroy it */
-              cinelerra_mutexacquirer_unlock (&lock);
-              cinelerra_mutex_destroy (&target->lock);
+              lumiera_mutexacquirer_unlock (&lock);
+              lumiera_mutex_destroy (&target->lock);
               free (target);
               return self;
             }
@@ -102,13 +102,13 @@ cinelerra_reference_destroy (CinelerraReference self)
       if (!--target->weak_cnt && !target->strong_cnt)
         {
           /* was last weak reference, and no strong refs left */
-          cinelerra_mutexacquirer_unlock (&lock);
-          cinelerra_mutex_destroy (&target->lock);
+          lumiera_mutexacquirer_unlock (&lock);
+          lumiera_mutex_destroy (&target->lock);
           free (target);
           return self;
         }
     }
-  cinelerra_mutexacquirer_unlock (&lock);
+  lumiera_mutexacquirer_unlock (&lock);
   return self;
 }
 
@@ -118,11 +118,11 @@ cinelerra_reference_destroy (CinelerraReference self)
  * @return self as strong reference (always for strong references) or NULL if source is an invalidated weak reference,
  * in the later case the reference is constructed as weak reference barely to allow it be destroyed
  */
-CinelerraReference
-cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference source)
+LumieraReference
+lumiera_reference_strong_init (LumieraReference self, LumieraReference source)
 {
-  cinelerra_mutexacquirer lock;
-  cinelerra_mutexacquirer_init_mutex (&lock, &source->target->lock, CINELERRA_LOCKED);
+  lumiera_mutexacquirer lock;
+  lumiera_mutexacquirer_init_mutex (&lock, &source->target->lock, LUMIERA_LOCKED);
 
   self->object = source->target->object;
   self->target = source->target;
@@ -136,7 +136,7 @@ cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference sou
       ++self->target->weak_cnt;
       self = NULL;
     }
-  cinelerra_mutexacquirer_unlock (&lock);
+  lumiera_mutexacquirer_unlock (&lock);
   return self;
 }
 
@@ -145,11 +145,11 @@ cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference sou
  * @param source reference to copy
  * @return self (always for strong references) or NULL if self is an invalidated weak reference
  */
-CinelerraReference
-cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference source)
+LumieraReference
+lumiera_reference_weak_init (LumieraReference self, LumieraReference source)
 {
-  cinelerra_mutexacquirer lock;
-  cinelerra_mutexacquirer_init_mutex (&lock, &source->target->lock, CINELERRA_LOCKED);
+  lumiera_mutexacquirer lock;
+  lumiera_mutexacquirer_init_mutex (&lock, &source->target->lock, LUMIERA_LOCKED);
 
   self->object = NULL;
   self->target = source->target;
@@ -159,7 +159,7 @@ cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference sourc
     /* already invalidated */
     self = NULL;
 
-  cinelerra_mutexacquirer_unlock (&lock);
+  lumiera_mutexacquirer_unlock (&lock);
   return self;
 }
 
@@ -169,14 +169,14 @@ cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference sourc
  * do nothing if the referene is already weak
  * @return self or NULL if the final strong reference got removed,
  */
-CinelerraReference
-cinelerra_reference_weaken (restrict CinelerraReference self)
+LumieraReference
+lumiera_reference_weaken (restrict LumieraReference self)
 {
   /* is this a strong reference? */
   if (self->object)
     {
-      cinelerra_mutexacquirer lock;
-      cinelerra_mutexacquirer_init_mutex (&lock, &self->target->lock, CINELERRA_LOCKED);
+      lumiera_mutexacquirer lock;
+      lumiera_mutexacquirer_init_mutex (&lock, &self->target->lock, LUMIERA_LOCKED);
 
       self->object = NULL;
       ++self->target->weak_cnt;
@@ -187,7 +187,7 @@ cinelerra_reference_weaken (restrict CinelerraReference self)
           self->target->object = NULL;
           self = NULL;
         }
-      cinelerra_mutexacquirer_unlock (&lock);
+      lumiera_mutexacquirer_unlock (&lock);
     }
   return self;
 }
@@ -198,14 +198,14 @@ cinelerra_reference_weaken (restrict CinelerraReference self)
  * only references of object which are not already destroyed can be strengthened
  * @return self when successful, NULL when the object was already destroyed, 'self' stays a dead weak reference in that case
  */
-CinelerraReference
-cinelerra_reference_strengthen (CinelerraReference self)
+LumieraReference
+lumiera_reference_strengthen (LumieraReference self)
 {
   /* is this a weak reference? */
   if (!self->object)
     {
-      cinelerra_mutexacquirer lock;
-      cinelerra_mutexacquirer_init_mutex (&lock, &self->target->lock, CINELERRA_LOCKED);
+      lumiera_mutexacquirer lock;
+      lumiera_mutexacquirer_init_mutex (&lock, &self->target->lock, LUMIERA_LOCKED);
 
       if (self->target->object)
         {
@@ -215,7 +215,7 @@ cinelerra_reference_strengthen (CinelerraReference self)
         }
       else
         self = NULL;
-      cinelerra_mutexacquirer_unlock (&lock);
+      lumiera_mutexacquirer_unlock (&lock);
     }
   return self;
 }
diff --git a/src/lib/references.h b/src/lib/references.h
index a7de3f7f0..3e00457e7 100644
--- a/src/lib/references.h
+++ b/src/lib/references.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef CINELERRA_REFERENCES_H
-#define CINELERRA_REFERENCES_H
+#ifndef LUMIERA_REFERENCES_H
+#define LUMIERA_REFERENCES_H
 
 #include <nobug.h>
 
@@ -29,77 +29,77 @@
  */
 
 
-typedef struct cinelerra_reference_struct cinelerra_reference;
-typedef cinelerra_reference* CinelerraReference;
+typedef struct lumiera_reference_struct lumiera_reference;
+typedef lumiera_reference* LumieraReference;
 
 #include "lib/error.h"
 #include "lib/mutex.h"
 
 /* Implementation detail */
-struct cinelerra_reftarget_struct
+struct lumiera_reftarget_struct
 {
   void* object;
   void (*dtor)(void*);
   unsigned strong_cnt;          /*when strong becomes 0 obj is destroyed, if weak is 0 destroy target too*/
   unsigned weak_cnt;            /*when weak becomes 0 and !obj  and lock strong is 0, destroy target */
-  cinelerra_mutex lock;
+  lumiera_mutex lock;
 };
-typedef struct cinelerra_reftarget_struct cinelerra_reftarget;
-typedef cinelerra_reftarget* CinelerraReftarget;
+typedef struct lumiera_reftarget_struct lumiera_reftarget;
+typedef lumiera_reftarget* LumieraReftarget;
 
 
 /**
  * A reference pointing to some other object
  */
-struct cinelerra_reference_struct
+struct lumiera_reference_struct
 {
   void* object;    /*set for strong, NULL for weak*/
-  CinelerraReftarget target;
+  LumieraReftarget target;
 };
 
-#define cinelerra_reference \
-cinelerra_reference NOBUG_CLEANUP(cinelerra_reference_ensuredestroyed)
+#define lumiera_reference \
+lumiera_reference NOBUG_CLEANUP(lumiera_reference_ensuredestroyed)
 
 /* helper function for nobug */
 static inline void
-cinelerra_reference_ensuredestroyed (CinelerraReference self)
+lumiera_reference_ensuredestroyed (LumieraReference self)
 {
   ENSURE (!self->target, "forgot to destroy reference");
 }
 
 
-CinelerraReference
-cinelerra_reference_strong_init_once (CinelerraReference self, void* obj, void (*dtor)(void*));
+LumieraReference
+lumiera_reference_strong_init_once (LumieraReference self, void* obj, void (*dtor)(void*));
 
 
-CinelerraReference
-cinelerra_reference_destroy (CinelerraReference self);
+LumieraReference
+lumiera_reference_destroy (LumieraReference self);
 
 /**
  * Get object from a strong reference.
  * @return pointer to object, NULL if applied to a weak reference
  */
 static inline void*
-cinelerra_reference_get (CinelerraReference self)
+lumiera_reference_get (LumieraReference self)
 {
   ENSURE (self->target, "illegal reference (not initialized or already destroyed?)");
   return self->object;
 }
 
 
-CinelerraReference
-cinelerra_reference_strong_init (CinelerraReference self, CinelerraReference source);
+LumieraReference
+lumiera_reference_strong_init (LumieraReference self, LumieraReference source);
 
 
-CinelerraReference
-cinelerra_reference_weak_init (CinelerraReference self, CinelerraReference source);
+LumieraReference
+lumiera_reference_weak_init (LumieraReference self, LumieraReference source);
 
 
-CinelerraReference
-cinelerra_reference_weaken (restrict CinelerraReference self);
+LumieraReference
+lumiera_reference_weaken (restrict LumieraReference self);
 
 
-CinelerraReference
-cinelerra_reference_strengthen (CinelerraReference self);
+LumieraReference
+lumiera_reference_strengthen (LumieraReference self);
 
 #endif
diff --git a/src/lib/rwlock.c b/src/lib/rwlock.c
index d60223e3c..c7ee3a37d 100644
--- a/src/lib/rwlock.c
+++ b/src/lib/rwlock.c
@@ -23,8 +23,8 @@
 #include <errno.h>
 #include "lib/rwlock.h"
 
-CINELERRA_ERROR_DEFINE(RWLOCK_AGAIN, "maximum number of readlocks exceed");
-CINELERRA_ERROR_DEFINE(RWLOCK_DEADLOCK, "deadlock detected");
+LUMIERA_ERROR_DEFINE(RWLOCK_AGAIN, "maximum number of readlocks exceed");
+LUMIERA_ERROR_DEFINE(RWLOCK_DEADLOCK, "deadlock detected");
 
 /**
  * @file Read/write locks.
@@ -36,8 +36,8 @@ CINELERRA_ERROR_DEFINE(RWLOCK_DEADLOCK, "deadlock detected");
  * @param self is a pointer to the rwlock to be initialized
  * @return self as given
  */
-CinelerraRWLock
-cinelerra_rwlock_init (CinelerraRWLock self)
+LumieraRWLock
+lumiera_rwlock_init (LumieraRWLock self)
 {
   if (self)
     {
@@ -51,13 +51,13 @@ cinelerra_rwlock_init (CinelerraRWLock self)
  * @param self is a pointer to the rwlock to be initialized
  * @return self on success or NULL at error
  */
-CinelerraRWLock
-cinelerra_rwlock_destroy (CinelerraRWLock self)
+LumieraRWLock
+lumiera_rwlock_destroy (LumieraRWLock self)
 {
   if (self)
     {
       if (pthread_rwlock_destroy (&self->rwlock))
-        CINELERRA_DIE;
+        LUMIERA_DIE;
     }
   return self;
 }
@@ -69,44 +69,44 @@ cinelerra_rwlock_destroy (CinelerraRWLock self)
  * initialize a rwlockacquirer state
  * @param self rwlockacquirer to be initialized, must be an automatic variable
  * @param rwlock associated rwlock
- * @param state initial state of the mutex, either CINELERRA_RDLOCKED, CINELERRA_WRLOCKED or CINELERRA_UNLOCKED
+ * @param state initial state of the mutex, either LUMIERA_RDLOCKED, LUMIERA_WRLOCKED or LUMIERA_UNLOCKED
  * @return self as given or NULL on error
  */
-CinelerraRWLockacquirer
-cinelerra_rwlockacquirer_init (CinelerraRWLockacquirer self, CinelerraRWLock rwlock, enum cinelerra_lockstate state)
+LumieraRWLockacquirer
+lumiera_rwlockacquirer_init (LumieraRWLockacquirer self, LumieraRWLock rwlock, enum lumiera_lockstate state)
 {
   REQUIRE (self);
   REQUIRE (rwlock);
-  REQUIRE (state != CINELERRA_LOCKED, "illegal state for rwlock");
+  REQUIRE (state != LUMIERA_LOCKED, "illegal state for rwlock");
   self->rwlock = rwlock;
   self->state = state;
 
   switch (state)
     {
-    case CINELERRA_RDLOCKED:
+    case LUMIERA_RDLOCKED:
       switch (pthread_rwlock_rdlock (&rwlock->rwlock))
         {
         case 0:
           break;
         case EAGAIN:
-          cinelerra_error_set (CINELERRA_ERROR_RWLOCK_AGAIN);
+          lumiera_error_set (LUMIERA_ERROR_RWLOCK_AGAIN);
           return NULL;
         case EDEADLK:
-          cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK);
+          lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK);
           return NULL;
         default:
-          CINELERRA_DIE;
+          LUMIERA_DIE;
         }
-    case CINELERRA_WRLOCKED:
+    case LUMIERA_WRLOCKED:
       switch (pthread_rwlock_wrlock (&rwlock->rwlock))
         {
         case 0:
           break;
         case EDEADLK:
-          cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK);
+          lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK);
           return NULL;
         default:
-          CINELERRA_DIE;
+          LUMIERA_DIE;
         }
     default:
       break;
@@ -121,27 +121,27 @@ cinelerra_rwlockacquirer_init (CinelerraRWLockacquirer self, CinelerraRWLock rwl
  * @param self rwlockacquirer associated with a rwlock
  * @return self as given or NULL on error
  */
-CinelerraRWLockacquirer
-cinelerra_rwlockacquirer_rdlock (CinelerraRWLockacquirer self)
+LumieraRWLockacquirer
+lumiera_rwlockacquirer_rdlock (LumieraRWLockacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_UNLOCKED, "rwlock already locked");
+  REQUIRE (self->state == LUMIERA_UNLOCKED, "rwlock already locked");
 
   switch (pthread_rwlock_rdlock (&self->rwlock->rwlock))
     {
     case 0:
       break;
     case EAGAIN:
-      cinelerra_error_set (CINELERRA_ERROR_RWLOCK_AGAIN);
+      lumiera_error_set (LUMIERA_ERROR_RWLOCK_AGAIN);
       return NULL;
     case EDEADLK:
-      cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK);
+      lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK);
       return NULL;
     default:
-      CINELERRA_DIE;
+      LUMIERA_DIE;
     }
 
-  self->state = CINELERRA_RDLOCKED;
+  self->state = LUMIERA_RDLOCKED;
   return self;
 }
 
@@ -152,24 +152,24 @@ cinelerra_rwlockacquirer_rdlock (CinelerraRWLockacquirer self)
  * @param self rwlockacquirer associated with a rwlock
  * @return self as given or NULL on error
  */
-CinelerraRWLockacquirer
-cinelerra_rwlockacquirer_wrlock (CinelerraRWLockacquirer self)
+LumieraRWLockacquirer
+lumiera_rwlockacquirer_wrlock (LumieraRWLockacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state == CINELERRA_UNLOCKED, "rwlock already locked");
+  REQUIRE (self->state == LUMIERA_UNLOCKED, "rwlock already locked");
 
   switch (pthread_rwlock_wrlock (&self->rwlock->rwlock))
     {
     case 0:
       break;
     case EDEADLK:
-      cinelerra_error_set (CINELERRA_ERROR_RWLOCK_DEADLOCK);
+      lumiera_error_set (LUMIERA_ERROR_RWLOCK_DEADLOCK);
       return NULL;
     default:
-      CINELERRA_DIE;
+      LUMIERA_DIE;
     }
 
-  self->state = CINELERRA_WRLOCKED;
+  self->state = LUMIERA_WRLOCKED;
   return self;
 }
 
diff --git a/src/lib/rwlock.h b/src/lib/rwlock.h
index 266887e24..922a05e7b 100644
--- a/src/lib/rwlock.h
+++ b/src/lib/rwlock.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef CINELERRA_RWLOCK_H
-#define CINELERRA_RWLOCK_H
+#ifndef LUMIERA_RWLOCK_H
+#define LUMIERA_RWLOCK_H
 
 #ifndef _GNU_SOURCE
 #error "This header must be included with _GNU_SOURCE or _POSIX_C_SOURCE >= 200112L defined"
@@ -31,8 +31,8 @@
 
 #include "lib/locking.h"
 
-CINELERRA_ERROR_DECLARE(RWLOCK_AGAIN);
-CINELERRA_ERROR_DECLARE(RWLOCK_DEADLOCK);
+LUMIERA_ERROR_DECLARE(RWLOCK_AGAIN);
+LUMIERA_ERROR_DECLARE(RWLOCK_DEADLOCK);
 
 /**
  * @file Read/write locks, header.
@@ -43,20 +43,20 @@ CINELERRA_ERROR_DECLARE(RWLOCK_DEADLOCK);
  * RWLock.
  *
  */
-struct cinelerra_rwlock_struct
+struct lumiera_rwlock_struct
 {
   pthread_rwlock_t rwlock;
 };
-typedef struct cinelerra_rwlock_struct cinelerra_rwlock;
-typedef cinelerra_rwlock* CinelerraRWLock;
+typedef struct lumiera_rwlock_struct lumiera_rwlock;
+typedef lumiera_rwlock* LumieraRWLock;
 
 
-CinelerraRWLock
-cinelerra_rwlock_init (CinelerraRWLock self);
+LumieraRWLock
+lumiera_rwlock_init (LumieraRWLock self);
 
 
-CinelerraRWLock
-cinelerra_rwlock_destroy (CinelerraRWLock self);
+LumieraRWLock
+lumiera_rwlock_destroy (LumieraRWLock self);
 
 
 
@@ -64,35 +64,35 @@ cinelerra_rwlock_destroy (CinelerraRWLock self);
 /**
  * rwlockacquirer used to manage the state of a rwlock variable.
  */
-struct cinelerra_rwlockacquirer_struct
+struct lumiera_rwlockacquirer_struct
 {
-  CinelerraRWLock rwlock;
-  enum cinelerra_lockstate  state;
+  LumieraRWLock rwlock;
+  enum lumiera_lockstate  state;
 };
-typedef struct cinelerra_rwlockacquirer_struct cinelerra_rwlockacquirer;
-typedef struct cinelerra_rwlockacquirer_struct* CinelerraRWLockacquirer;
+typedef struct lumiera_rwlockacquirer_struct lumiera_rwlockacquirer;
+typedef struct lumiera_rwlockacquirer_struct* LumieraRWLockacquirer;
 
 /* helper function for nobug */
 static inline void
-cinelerra_rwlockacquirer_ensureunlocked (CinelerraRWLockacquirer self)
+lumiera_rwlockacquirer_ensureunlocked (LumieraRWLockacquirer self)
 {
-  ENSURE (self->state == CINELERRA_UNLOCKED, "forgot to unlock the rwlock mutex");
+  ENSURE (self->state == LUMIERA_UNLOCKED, "forgot to unlock the rwlock mutex");
 }
 
 /* override with a macro to use the cleanup checker */
-#define cinelerra_rwlockacquirer \
-cinelerra_rwlockacquirer NOBUG_CLEANUP(cinelerra_rwlockacquirer_ensureunlocked)
+#define lumiera_rwlockacquirer \
+lumiera_rwlockacquirer NOBUG_CLEANUP(lumiera_rwlockacquirer_ensureunlocked)
 
 
-CinelerraRWLockacquirer
-cinelerra_rwlockacquirer_init (CinelerraRWLockacquirer self, CinelerraRWLock rwlock, enum cinelerra_lockstate state);
+LumieraRWLockacquirer
+lumiera_rwlockacquirer_init (LumieraRWLockacquirer self, LumieraRWLock rwlock, enum lumiera_lockstate state);
 
-CinelerraRWLockacquirer
-cinelerra_rwlockacquirer_rdlock (CinelerraRWLockacquirer self);
+LumieraRWLockacquirer
+lumiera_rwlockacquirer_rdlock (LumieraRWLockacquirer self);
 
 
-CinelerraRWLockacquirer
-cinelerra_rwlockacquirer_wrlock (CinelerraRWLockacquirer self);
+LumieraRWLockacquirer
+lumiera_rwlockacquirer_wrlock (LumieraRWLockacquirer self);
 
 
 /**
@@ -101,13 +101,13 @@ cinelerra_rwlockacquirer_wrlock (CinelerraRWLockacquirer self);
  * @param self rwlockacquirer associated with a rwlock variable
  */
 static inline void
-cinelerra_rwlockacquirer_unlock (CinelerraRWLockacquirer self)
+lumiera_rwlockacquirer_unlock (LumieraRWLockacquirer self)
 {
   REQUIRE (self);
-  REQUIRE (self->state != CINELERRA_UNLOCKED, "rwlock was not locked");
+  REQUIRE (self->state != LUMIERA_UNLOCKED, "rwlock was not locked");
   if (pthread_rwlock_unlock (&self->rwlock->rwlock))
-    CINELERRA_DIE;
-  self->state = CINELERRA_UNLOCKED;
+    LUMIERA_DIE;
+  self->state = LUMIERA_UNLOCKED;
 }
 
 
diff --git a/src/lib/time.c b/src/lib/time.c
index 4566e44b5..83bfd9797 100644
--- a/src/lib/time.c
+++ b/src/lib/time.c
@@ -21,6 +21,6 @@
 
 #include "lib/error.h"
 
-CINELERRA_ERROR_DEFINE(TIME_OVERFLOW, "Time overflow");
-CINELERRA_ERROR_DEFINE(TIME_UNDERFLOW, "Time underflow");
-CINELERRA_ERROR_DEFINE(TIME_NEGATIVE, "Time negative");
+LUMIERA_ERROR_DEFINE(TIME_OVERFLOW, "Time overflow");
+LUMIERA_ERROR_DEFINE(TIME_UNDERFLOW, "Time underflow");
+LUMIERA_ERROR_DEFINE(TIME_NEGATIVE, "Time negative");
diff --git a/src/lib/time.h b/src/lib/time.h
index d4c05b71c..26b698742 100644
--- a/src/lib/time.h
+++ b/src/lib/time.h
@@ -19,8 +19,8 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef CINELERRA_TIME_H
-#define CINELERRA_TIME_H
+#ifndef LUMIERA_TIME_H
+#define LUMIERA_TIME_H
 
 #include <sys/time.h>
 #include <time.h>
@@ -35,31 +35,31 @@
 
   timehandling is a delicate business, be careful of precision errors accumulating
 
-  cinelerra_time is starting from zero, never becomes negative.
+  lumiera_time is starting from zero, never becomes negative.
   
   TODO explain how to use time
 
 */
 
 /* over or underflow (tried to make a movie which has negative length? or more than some hundreds days?) */
-CINELERRA_ERROR_DECLARE(TIME_OVERFLOW);
-CINELERRA_ERROR_DECLARE(TIME_UNDERFLOW);
-CINELERRA_ERROR_DECLARE(TIME_NEGATIVE);
+LUMIERA_ERROR_DECLARE(TIME_OVERFLOW);
+LUMIERA_ERROR_DECLARE(TIME_UNDERFLOW);
+LUMIERA_ERROR_DECLARE(TIME_NEGATIVE);
 
 /*
   Note: we measure time starting from zero,
   time never becomes negative
   (I didnt checked if the time types are signed)
 */
-typedef struct timeval cinelerra_time;
-typedef cinelerra_time* CinelerraTime;
+typedef struct timeval lumiera_time;
+typedef lumiera_time* LumieraTime;
 
 /**
  * normalize time after operations.
  * used internally
  */
 static inline void
-cinelerra_time_normalize (CinelerraTime time)
+lumiera_time_normalize (LumieraTime time)
 {
   REQUIRE (time);
   if (time->tv_usec >= 1000000)
@@ -75,8 +75,8 @@ cinelerra_time_normalize (CinelerraTime time)
  * @param time Time to clear
  * @return time as given
  */
-static inline CinelerraTime
-cinelerra_time_clear (CinelerraTime time)
+static inline LumieraTime
+lumiera_time_clear (LumieraTime time)
 {
   if(time)
     {
@@ -91,14 +91,14 @@ cinelerra_time_clear (CinelerraTime time)
  * @param time Time to put current time into.
  * @return time as given
  */
-static inline CinelerraTime
-cinelerra_time_current (CinelerraTime time)
+static inline LumieraTime
+lumiera_time_current (LumieraTime time)
 {
   if (time)
     {
       /* gettime should never ever fail in a correct program */
       if (gettimeofday (time, NULL))
-        CINELERRA_DIE;
+        LUMIERA_DIE;
     }
   return time;
 }
@@ -110,8 +110,8 @@ cinelerra_time_current (CinelerraTime time)
  * @return time as given upon success, NULL if double time given was negative or given time didn't point
  * anywhere
  */
-static inline CinelerraTime
-cinelerra_time_set_double (CinelerraTime time, double fp)
+static inline LumieraTime
+lumiera_time_set_double (LumieraTime time, double fp)
 {
   if (time)
     {
@@ -125,7 +125,7 @@ cinelerra_time_set_double (CinelerraTime time, double fp)
         {
           time->tv_sec = (time_t)-1;
           time->tv_usec = (suseconds_t)-1;
-          cinelerra_error_set(CINELERRA_ERROR_TIME_NEGATIVE);
+          lumiera_error_set(LUMIERA_ERROR_TIME_NEGATIVE);
         }
     }
   return NULL;
@@ -138,14 +138,14 @@ cinelerra_time_set_double (CinelerraTime time, double fp)
  * @param usec Microseconds to set
  * @param Time as given
  */
-static inline CinelerraTime
-cinelerra_time_init (CinelerraTime time, time_t sec, suseconds_t usec)
+static inline LumieraTime
+lumiera_time_init (LumieraTime time, time_t sec, suseconds_t usec)
 {
   if (time)
     {
       time->tv_sec = sec;
       time->tv_usec = usec;
-      cinelerra_time_normalize (time);
+      lumiera_time_normalize (time);
     }
   return time;
 }
@@ -156,7 +156,7 @@ cinelerra_time_init (CinelerraTime time, time_t sec, suseconds_t usec)
  * @return Seconds elapsed, -1 on error
  */
 static inline time_t
-cinelerra_time_sec (CinelerraTime time)
+lumiera_time_sec (LumieraTime time)
 {
   if (time)
     return time->tv_sec;
@@ -170,7 +170,7 @@ cinelerra_time_sec (CinelerraTime time)
  * @return Microseconds elapsed, -1 on error
  */
 static inline suseconds_t
-cinelerra_time_usec (CinelerraTime time)
+lumiera_time_usec (LumieraTime time)
 {
   if (time)
     return time->tv_usec;
@@ -184,7 +184,7 @@ cinelerra_time_usec (CinelerraTime time)
  * @return Floating point representation of time. NAN on error.
  */
 static inline double
-cinelerra_time_double_get (CinelerraTime time)
+lumiera_time_double_get (LumieraTime time)
 {
   if (time)
     {
@@ -204,8 +204,8 @@ cinelerra_time_double_get (CinelerraTime time)
  * @param src Time-source to copy from
  * @return dest as given
  */
-static inline CinelerraTime
-cinelerra_time_copy (CinelerraTime dest, const CinelerraTime src)
+static inline LumieraTime
+lumiera_time_copy (LumieraTime dest, const LumieraTime src)
 {
   if (dest && src)
     {
@@ -221,8 +221,8 @@ cinelerra_time_copy (CinelerraTime dest, const CinelerraTime src)
  * @param src Time to add to dest
  * @return dest as given, or NULL on overflow.
  */
-static inline CinelerraTime
-cinelerra_time_add (CinelerraTime dest, const CinelerraTime src)
+static inline LumieraTime
+lumiera_time_add (LumieraTime dest, const LumieraTime src)
 {
   if (dest && src)
     {
@@ -231,11 +231,11 @@ cinelerra_time_add (CinelerraTime dest, const CinelerraTime src)
       dest->tv_sec += src->tv_sec;
       dest->tv_usec += src->tv_usec;
 
-      cinelerra_time_normalize (dest);
+      lumiera_time_normalize (dest);
 
       if (dest->tv_sec < t)
         {
-          cinelerra_error_set (CINELERRA_ERROR_TIME_OVERFLOW);
+          lumiera_error_set (LUMIERA_ERROR_TIME_OVERFLOW);
           return NULL;
         }
     }
@@ -248,8 +248,8 @@ cinelerra_time_add (CinelerraTime dest, const CinelerraTime src)
  * @param src Time to subtract from dest
  * @return dest as given, or NULL on underflow.
  */
-static inline CinelerraTime
-cinelerra_time_sub (CinelerraTime dest, const CinelerraTime src)
+static inline LumieraTime
+lumiera_time_sub (LumieraTime dest, const LumieraTime src)
 {
   if (dest && src)
     {
@@ -264,11 +264,11 @@ cinelerra_time_sub (CinelerraTime dest, const CinelerraTime src)
           dest->tv_usec += 1000000 - src->tv_usec;
         }
 
-      cinelerra_time_normalize (dest);
+      lumiera_time_normalize (dest);
 
       if (dest->tv_sec > t)
         {
-          cinelerra_error_set (CINELERRA_ERROR_TIME_UNDERFLOW);
+          lumiera_error_set (LUMIERA_ERROR_TIME_UNDERFLOW);
           return NULL;
         }
     }
diff --git a/src/cinelerra.h b/src/lumiera.h
similarity index 90%
rename from src/cinelerra.h
rename to src/lumiera.h
index 30264a904..12b1578b9 100644
--- a/src/cinelerra.h
+++ b/src/lumiera.h
@@ -1,5 +1,5 @@
 /*
-  CINELERRA.h  -  global definitions and common types
+  LUMIERA.h  -  global definitions and common types
  
  
   Copyright (C)         Lumiera.org
@@ -22,8 +22,8 @@
  
 */
 
-#ifndef CINELERRA_H
-#define CINELERRA_H
+#ifndef LUMIERA_H
+#define LUMIERA_H
 
 
 
@@ -54,13 +54,13 @@ extern "C" {
 #include "common/error.hpp"
 
 
-namespace cinelerra
+namespace lumiera
   {
     /* additional global configuration goes here... */
   
     
-} // namespace cinelerra
+} // namespace lumiera
 
 #endif /* ===================== (End) C++-Part ================= */
 
-#endif /*CINELERRA_H*/
+#endif /*LUMIERA_H*/
diff --git a/src/main.cpp b/src/main.cpp
index 8d564ed87..398cdc3df 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,11 +23,11 @@
 
 #include <iostream>
 
-#include "cinelerra.h"
+#include "lumiera.h"
 
 using std::cout;
 using std::endl;
-using cinelerra::Appconfig;
+using lumiera::Appconfig;
 
 
 int main (int argc, char* argv[])
diff --git a/src/nobugcfg.h b/src/nobugcfg.h
index 2cd719a87..916f28663 100644
--- a/src/nobugcfg.h
+++ b/src/nobugcfg.h
@@ -27,7 +27,7 @@
  ** The idea is that configuration and some globally used flag 
  ** declarations are to be kept in one central location. Normally,
  ** this header will be included by appconfig.hpp, which in turn gets
- ** included by cinelerra.h
+ ** included by lumiera.h
  ** @par Besides the usual guarded declarations, this header contains
  ** one section with the corresponding <b>definitions</b>. This section
  ** is to be called by appconfig.cpp only, which deals with application
diff --git a/src/plugin/helloplugin.c b/src/plugin/helloplugin.c
index 62a033f4e..d75f55f94 100644
--- a/src/plugin/helloplugin.c
+++ b/src/plugin/helloplugin.c
@@ -1,12 +1,12 @@
 /*
  * hello.c - demonstrates how to build a standalone tool (C source) 
- *           integrated into the SCons based build system of Cinelerra
+ *           integrated into the SCons based build system of Lumiera
  */
 
 #include <stdio.h>
 
 int main(int argc, char* argv[])
   {
-    printf("hello cinelerra world");
+    printf("hello lumiera world");
     return 0;
   }
diff --git a/src/pre.hpp b/src/pre.hpp
index 8c504c368..19717c2bb 100644
--- a/src/pre.hpp
+++ b/src/pre.hpp
@@ -33,8 +33,8 @@
  ** @see mobject.hpp usage example
  */
 
-#ifndef CINELERRA_PRE_HPP
-#define CINELERRA_PRE_HPP
+#ifndef LUMIERA_PRE_HPP
+#define LUMIERA_PRE_HPP
 
 #include <string>
 #include <vector>
@@ -44,8 +44,8 @@
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 
-#include "cinelerra.h"
+#include "lumiera.h"
 
 
 
-#endif /*CINELERRA_PRE_HPP*/
+#endif /*LUMIERA_PRE_HPP*/
diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp
index d97c2fd9e..99fd50670 100644
--- a/src/proc/asset.cpp
+++ b/src/proc/asset.cpp
@@ -111,7 +111,7 @@ namespace asset
 
   /**change the enablement status of this asset. */
   bool
-  Asset::enable (bool on)  throw(cinelerra::error::State)
+  Asset::enable (bool on)  throw(lumiera::error::State)
   {
     if (on == this->enabled)
       return true;
diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp
index cec77bec4..0387e85ba 100644
--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@@ -155,7 +155,7 @@ namespace asset
           /** origin or authorship id. 
            *  Can be a project abbreviation, a package id or just the authors nickname or UID.
            *  This allows for the compnent name to be more generic (e.g. "blur"). 
-           *  Default for all assets provided by the core cinelerra-3 codebase is "cin3".
+           *  Default for all assets provided by the core Lumiera codebase is "lumi".
            */
           const string org;
     
@@ -284,7 +284,7 @@ namespace asset
        *  @return \c false if the state could not be changed
        *          due to parent objects being disabled
        */
-      bool enable (bool on=true)  throw(cinelerra::error::State);
+      bool enable (bool on=true)  throw(lumiera::error::State);
       
       
     };
diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp
index 9f33b01af..af31df9a3 100644
--- a/src/proc/asset/db.hpp
+++ b/src/proc/asset/db.hpp
@@ -87,7 +87,7 @@ namespace asset
       DB () : table() { }
       ~DB ()          {clear();}
       
-      friend class cinelerra::singleton::StaticCreate<DB>;
+      friend class lumiera::singleton::StaticCreate<DB>;
       
       
     public:
@@ -125,7 +125,7 @@ namespace asset
               
               table.clear();
             }
-          catch (cinelerra::Error& EX)
+          catch (lumiera::Error& EX)
             {
               WARN (oper, "Problems while clearing Asset registry: %s", EX.what());
             }
diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp
index 1610e822e..60a1ecd19 100644
--- a/src/proc/asset/media.cpp
+++ b/src/proc/asset/media.cpp
@@ -116,7 +116,7 @@ namespace asset
   }
   
   
-  cinelerra::Time
+  lumiera::Time
   Media::getLength()  const
   {
      return len_;
@@ -177,7 +177,7 @@ namespace asset
   MediaFactory::PType 
   MediaFactory::operator() (const string& file, const Category& cat)
   { 
-    Asset::Ident key(extractName(file), cat, "cin3", 1);
+    Asset::Ident key(extractName(file), cat, "lumi", 1);
     return operator() (key, file);
   }
   
@@ -220,21 +220,21 @@ namespace asset
    *         but rather part or a multichannel (compound) media
    */
   shared_ptr<asset::Clip>
-  MediaFactory::operator() (asset::Media& mediaref)  throw(cinelerra::error::Invalid)
+  MediaFactory::operator() (asset::Media& mediaref)  throw(lumiera::error::Invalid)
   {
     if (mediaref.checkCompound())
-      throw cinelerra::error::Invalid (str(format("Attempt to create a asset::Clip from the media %s, "
-                                                  "which is not toplevel but rather part or a compound "
-                                                  "(multichannel) media. Found parent Media %s.") 
-                                                  % string(mediaref) 
-                                                  % string(*mediaref.checkCompound()))
-                                      ,CINELERRA_ERROR_PART_OF_COMPOUND
-                                      );
+      throw lumiera::error::Invalid (str(format("Attempt to create a asset::Clip from the media %s, "
+                                                "which is not toplevel but rather part or a compound "
+                                                "(multichannel) media. Found parent Media %s.") 
+                                                % string(mediaref) 
+                                                % string(*mediaref.checkCompound()))
+                                    ,LUMIERA_ERROR_PART_OF_COMPOUND
+                                    );
     asset::Clip* pC = new asset::Clip (mediaref);
     return AssetManager::instance().getPtr (*pC);
   }
   
-  CINELERRA_ERROR_DEFINE (PART_OF_COMPOUND, "part of compound used as toplevel element");
+  LUMIERA_ERROR_DEFINE (PART_OF_COMPOUND, "part of compound used as toplevel element");
   
 
 
diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp
index 67c6a31ca..ce43d6231 100644
--- a/src/proc/asset/media.hpp
+++ b/src/proc/asset/media.hpp
@@ -50,7 +50,7 @@ namespace asset
   class MediaFactory;
   class ProcPatt;
   
-  using cinelerra::Time;
+  using lumiera::Time;
   
   
   template<>
@@ -137,7 +137,7 @@ namespace asset
   /** 
    * Factory specialized for creating Media Asset objects.
    */ 
-  class MediaFactory : public cinelerra::Factory<asset::Media>
+  class MediaFactory : public lumiera::Factory<asset::Media>
     {
     public:
       typedef shared_ptr<asset::Media> PType;
@@ -151,11 +151,11 @@ namespace asset
       PType operator() (const char* file, asset::Kind);
       
       shared_ptr<asset::Clip>
-      operator() (asset::Media& mediaref)  throw(cinelerra::error::Invalid);
+      operator() (asset::Media& mediaref)  throw(lumiera::error::Invalid);
 
     };
 
-  CINELERRA_ERROR_DECLARE (PART_OF_COMPOUND);
+  LUMIERA_ERROR_DECLARE (PART_OF_COMPOUND);
     
     
     
diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp
index e995f53a3..89500c226 100644
--- a/src/proc/asset/meta.hpp
+++ b/src/proc/asset/meta.hpp
@@ -90,7 +90,7 @@ namespace asset
   /** 
    * Factory specialized for createing Metadata Asset objects.
    */ 
-  class MetaFactory : public cinelerra::Factory<asset::Meta>
+  class MetaFactory : public lumiera::Factory<asset::Meta>
     {
     public:
       typedef shared_ptr<asset::Meta> PType;
diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp
index 229f66fcd..b98fa8014 100644
--- a/src/proc/asset/proc.hpp
+++ b/src/proc/asset/proc.hpp
@@ -89,7 +89,7 @@ namespace asset
   /** 
    * Factory specialized for createing Processor Asset objects.
    */ 
-  class ProcFactory : public cinelerra::Factory<asset::Proc>
+  class ProcFactory : public lumiera::Factory<asset::Proc>
     {
     public:
       typedef shared_ptr<asset::Proc> PType;
diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp
index 24cc5c053..96dd63001 100644
--- a/src/proc/asset/struct.hpp
+++ b/src/proc/asset/struct.hpp
@@ -91,7 +91,7 @@ namespace asset
   /** 
    * Factory specialized for createing Structural Asset objects.
    */ 
-  class StructFactory : public cinelerra::Factory<asset::Struct>
+  class StructFactory : public lumiera::Factory<asset::Struct>
     {
     public:
       typedef shared_ptr<asset::Struct> PType;
diff --git a/src/proc/asset/unknown.cpp b/src/proc/asset/unknown.cpp
index 25d91936c..b47a60113 100644
--- a/src/proc/asset/unknown.cpp
+++ b/src/proc/asset/unknown.cpp
@@ -48,19 +48,19 @@ namespace asset
    *  try to access the "real" media it stands for.
    */
   Media::PMedia 
-  Unknown::getOrg()  throw(cinelerra::error::Invalid)
+  Unknown::getOrg()  throw(lumiera::error::Invalid)
   {
     UNIMPLEMENTED ("how to get at the original media from a »Unknown« placeholder");
     if (1==0)
-      throw cinelerra::error::Invalid (str(format("Unable to locate original media "
-                                                  "for ID=%s, filename=\"%s\".") 
-                                                  % string(this->ident) 
-                                                  % string(this->getFilename()))
-                                      ,CINELERRA_ERROR_ORIG_NOT_FOUND
-                                      );
+      throw lumiera::error::Invalid (str(format("Unable to locate original media "
+                                                "for ID=%s, filename=\"%s\".") 
+                                                % string(this->ident) 
+                                                % string(this->getFilename()))
+                                    ,LUMIERA_ERROR_ORIG_NOT_FOUND
+                                    );
   }
   
-  CINELERRA_ERROR_DEFINE (ORIG_NOT_FOUND, "Media refered by placeholder not found");
+  LUMIERA_ERROR_DEFINE (ORIG_NOT_FOUND, "Media refered by placeholder not found");
 
   
   
diff --git a/src/proc/asset/unknown.hpp b/src/proc/asset/unknown.hpp
index aa9cd6ec3..bcd0bda9f 100644
--- a/src/proc/asset/unknown.hpp
+++ b/src/proc/asset/unknown.hpp
@@ -32,7 +32,7 @@ namespace asset
   {
   
 
-  const cinelerra::Time DUMMY_TIME (25); ///< @todo solve konfig management
+  const lumiera::Time DUMMY_TIME (25); ///< @todo solve konfig management
 
   /**
    * Placeholder Asset for unknown or unavailable media source.
@@ -47,11 +47,11 @@ namespace asset
       friend class MediaFactory;
       
     public:
-      virtual Media::PMedia getOrg()  throw(cinelerra::error::Invalid);
+      virtual Media::PMedia getOrg()  throw(lumiera::error::Invalid);
       
     };
     
-  CINELERRA_ERROR_DECLARE (ORIG_NOT_FOUND);
+  LUMIERA_ERROR_DECLARE (ORIG_NOT_FOUND);
     
     
     
diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp
index bc6f42ecd..68843444a 100644
--- a/src/proc/assetmanager.cpp
+++ b/src/proc/assetmanager.cpp
@@ -38,8 +38,8 @@ using boost::format;
 using boost::bind;
 using util::for_each;
 
-using cinelerra::Singleton;
-using cinelerra::Thread;
+using lumiera::Singleton;
+using lumiera::Thread;
 
 
 namespace asset
@@ -49,23 +49,23 @@ namespace asset
    * AssetManager error responses, caused by querying
    * invalid Asset IDs from the internal DB.
    */ 
-  class IDErr : public cinelerra::error::Invalid 
+  class IDErr : public lumiera::error::Invalid 
     {
     public:
       IDErr (const char* eID, format fmt) 
-        : cinelerra::error::Invalid(fmt.str(),eID) {}
+        : lumiera::error::Invalid(fmt.str(),eID) {}
     };
 
   
    // ------pre-defined-common-error-cases---------------
   //
-  CINELERRA_ERROR_DEFINE (UNKNOWN_ASSET_ID, "non-registered Asset ID");
-  CINELERRA_ERROR_DEFINE (WRONG_ASSET_KIND, "wrong Asset kind, unable to cast");
+  LUMIERA_ERROR_DEFINE (UNKNOWN_ASSET_ID, "non-registered Asset ID");
+  LUMIERA_ERROR_DEFINE (WRONG_ASSET_KIND, "wrong Asset kind, unable to cast");
   
   class UnknownID : public IDErr
     {
     public:
-      UnknownID (ID<Asset> aID) : IDErr (CINELERRA_ERROR_UNKNOWN_ASSET_ID, 
+      UnknownID (ID<Asset> aID) : IDErr (LUMIERA_ERROR_UNKNOWN_ASSET_ID, 
                                          format("Query for Asset with ID=%d, which up to now "
                                                 "hasn't been created or encountered.") % aID) {}
     };
@@ -73,7 +73,7 @@ namespace asset
   class WrongKind : public IDErr
     {
     public:
-      WrongKind (Asset::Ident idi) : IDErr (CINELERRA_ERROR_WRONG_ASSET_KIND,
+      WrongKind (Asset::Ident idi) : IDErr (LUMIERA_ERROR_WRONG_ASSET_KIND,
                                             format("Request for Asset(%s), specifying an Asset kind, "
                                                    "that doesn't match the actual type (and can't be "
                                                    "casted either).") % string(idi)) {}
@@ -110,7 +110,7 @@ namespace asset
   template<class KIND>
   ID<KIND>  
   AssetManager::reg (KIND* obj, const Asset::Ident& idi)
-      throw(cinelerra::error::Invalid)
+      throw(lumiera::error::Invalid)
   {
     typedef shared_ptr<KIND> PType;
     AssetManager& _aMang (AssetManager::instance());
@@ -133,7 +133,7 @@ namespace asset
   template<class KIND>
   shared_ptr<KIND>
   AssetManager::getAsset (const ID<KIND>& id)  
-      throw(cinelerra::error::Invalid)
+      throw(lumiera::error::Invalid)
   {
     if (shared_ptr<KIND> obj = registry.get (id))
       return obj;
@@ -243,11 +243,11 @@ namespace asset
   template ID<Asset> AssetManager::reg (Asset* obj, const Asset::Ident& idi);
   
   
-  template shared_ptr<Asset>  AssetManager::getAsset (const ID<Asset>&  id)  throw(cinelerra::error::Invalid);
-  template shared_ptr<Media>  AssetManager::getAsset (const ID<Media>&  id)  throw(cinelerra::error::Invalid);
-  template shared_ptr<Proc>   AssetManager::getAsset (const ID<Proc>&   id)  throw(cinelerra::error::Invalid);
-  template shared_ptr<Struct> AssetManager::getAsset (const ID<Struct>& id)  throw(cinelerra::error::Invalid);
-  template shared_ptr<Meta>   AssetManager::getAsset (const ID<Meta>&   id)  throw(cinelerra::error::Invalid);
+  template shared_ptr<Asset>  AssetManager::getAsset (const ID<Asset>&  id)  throw(lumiera::error::Invalid);
+  template shared_ptr<Media>  AssetManager::getAsset (const ID<Media>&  id)  throw(lumiera::error::Invalid);
+  template shared_ptr<Proc>   AssetManager::getAsset (const ID<Proc>&   id)  throw(lumiera::error::Invalid);
+  template shared_ptr<Struct> AssetManager::getAsset (const ID<Struct>& id)  throw(lumiera::error::Invalid);
+  template shared_ptr<Meta>   AssetManager::getAsset (const ID<Meta>&   id)  throw(lumiera::error::Invalid);
   
   template shared_ptr<Asset>  AssetManager::getPtr (const Asset& asset);
   template shared_ptr<Media>  AssetManager::getPtr (const Media& asset);
diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp
index d1b20e025..b2362db00 100644
--- a/src/proc/assetmanager.hpp
+++ b/src/proc/assetmanager.hpp
@@ -66,7 +66,7 @@ namespace asset
     
     
     public:
-      static cinelerra::Singleton<AssetManager> instance;
+      static lumiera::Singleton<AssetManager> instance;
       
       /** provide the unique ID for given Asset::Ident tuple */
       static ID<Asset> getID (const Asset::Ident&);
@@ -77,7 +77,7 @@ namespace asset
       
       /** find and return corresponging object */
       template<class KIND>
-      shared_ptr<KIND>  getAsset (const ID<KIND>& id)  throw(cinelerra::error::Invalid);
+      shared_ptr<KIND>  getAsset (const ID<KIND>& id)  throw(lumiera::error::Invalid);
       
       
       /** @return true if the given id is registered in the internal asset DB  */
@@ -101,7 +101,7 @@ namespace asset
        */
       template<class KIND>
       static ID<KIND>  reg (KIND* obj, const Asset::Ident& idi)
-          throw(cinelerra::error::Invalid);
+          throw(lumiera::error::Invalid);
       
       /** deleter function used by the Asset smart pointers to delete Asset objects */
       static void destroy (Asset* aa) { delete aa; }
@@ -110,13 +110,13 @@ namespace asset
       
       AssetManager ();
       
-      friend class cinelerra::singleton::StaticCreate<AssetManager>;
+      friend class lumiera::singleton::StaticCreate<AssetManager>;
       
     };
     
     
-    CINELERRA_ERROR_DECLARE (UNKNOWN_ASSET_ID);  ///< use of a non-registered Asset ID.
-    CINELERRA_ERROR_DECLARE (WRONG_ASSET_KIND);  ///< Asset ID of wrong Asset kind, unable to cast.
+    LUMIERA_ERROR_DECLARE (UNKNOWN_ASSET_ID);  ///< use of a non-registered Asset ID.
+    LUMIERA_ERROR_DECLARE (WRONG_ASSET_KIND);  ///< Asset ID of wrong Asset kind, unable to cast.
 
 } // namespace asset
 
diff --git a/src/proc/engine/codecadapter.hpp b/src/proc/engine/codecadapter.hpp
index 5b4991177..724763eaa 100644
--- a/src/proc/engine/codecadapter.hpp
+++ b/src/proc/engine/codecadapter.hpp
@@ -38,7 +38,7 @@ namespace engine
    * process thus is integrated into the framework
    * of the Renderengine, while the actual implementation
    * can be delegated to an external library accessed
-   * through Cinelerra's datat backend. 
+   * through Lumiera's data backend. 
    */
   class CodecAdapter : public Trafo
     {};
diff --git a/src/proc/engine/pluginadapter.hpp b/src/proc/engine/pluginadapter.hpp
index b080b99ed..b771f1fbc 100644
--- a/src/proc/engine/pluginadapter.hpp
+++ b/src/proc/engine/pluginadapter.hpp
@@ -35,7 +35,7 @@ namespace engine
   /**
    * Adapter used to integrate an effects processor in the render pipeline.
    * Effects processors are typically defined in a separate library and
-   * will be loaded at runtime using Cinelerra's plugin interface.
+   * will be loaded at runtime using Lumiera's plugin interface.
    */
   class PluginAdapter : public Trafo
     {
diff --git a/src/proc/engine/processor.hpp b/src/proc/engine/processor.hpp
index 70ec33f6c..6b7317886 100644
--- a/src/proc/engine/processor.hpp
+++ b/src/proc/engine/processor.hpp
@@ -24,7 +24,7 @@
 #ifndef ENGINE_PROCESSOR_H
 #define ENGINE_PROCESSOR_H
 
-#include "cinelerra.h"
+#include "lumiera.h"
 #include "proc/stateproxy.hpp"
 
 
@@ -40,10 +40,10 @@ namespace engine
       ExitNode * output;
 
       /** begin of the timerange covered by this processor */
-      cinelerra::Time start;
+      lumiera::Time start;
 
       /**end (exclusive) of the timerange  */
-      cinelerra::Time end;
+      lumiera::Time end;
 
     };
 
diff --git a/src/proc/mobject/builder/buildertool.hpp b/src/proc/mobject/builder/buildertool.hpp
index c4700bc0a..0985567d1 100644
--- a/src/proc/mobject/builder/buildertool.hpp
+++ b/src/proc/mobject/builder/buildertool.hpp
@@ -59,7 +59,7 @@ namespace mobject
      * an instantiation of the "Applicable" template parametrized with all 
      * concrete Buildable classes, for which it wants calls to be dispatched. 
      */
-    typedef cinelerra::visitor::Tool<void, InvokeCatchAllFunction> BuilderTool;
+    typedef lumiera::visitor::Tool<void, InvokeCatchAllFunction> BuilderTool;
     
     
     template
@@ -67,11 +67,11 @@ namespace mobject
         class TYPELIST  //  list of all concrete Buildables to be treated
       >
     class Applicable
-      : public cinelerra::visitor::Applicable<TOOLImpl, TYPELIST, BuilderTool>
+      : public lumiera::visitor::Applicable<TOOLImpl, TYPELIST, BuilderTool>
       { }
       ;
       
-    using cinelerra::typelist::Types;   // convienience for the users of "Applicable"
+    using lumiera::typelist::Types;   // convienience for the users of "Applicable"
 
   } // namespace mobject::builder
   
@@ -80,7 +80,7 @@ namespace mobject
   /**
    *  Marker Interface for classes Visitable by Builder tools. 
    */
-  class Buildable : public cinelerra::visitor::Visitable<builder::BuilderTool>
+  class Buildable : public lumiera::visitor::Visitable<builder::BuilderTool>
     { };
 
 } // namespace mobject
diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp
index b7c139f93..3d0222a3d 100644
--- a/src/proc/mobject/mobject.hpp
+++ b/src/proc/mobject/mobject.hpp
@@ -29,7 +29,7 @@
 #include <list>
 #include <tr1/memory>
 
-#include "cinelerra.h"
+#include "lumiera.h"
 #include "proc/mobject/builder/buildertool.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/asset.hpp"                 // TODO finally not needed?
@@ -55,13 +55,13 @@ namespace mobject
   /**
    * MObject is the interface class for all "Media Objects".
    * All the contents and elements that can be placed and 
-   * manipulated and finally rendered within Cinelerra's EDL 
+   * manipulated and finally rendered within Lumiera's EDL 
    * are MObjects.
    */
   class MObject : public Buildable
     {
     protected:
-      typedef cinelerra::Time Time;
+      typedef lumiera::Time Time;
 
       // TODO: how to represent time intervals best?
       Time length;
diff --git a/src/proc/mobject/placement.hpp b/src/proc/mobject/placement.hpp
index 71c654308..3e941b7d5 100644
--- a/src/proc/mobject/placement.hpp
+++ b/src/proc/mobject/placement.hpp
@@ -86,7 +86,7 @@ namespace mobject
   class Placement : protected shared_ptr<MO>
     {
     protected:
-      typedef cinelerra::Time Time;
+      typedef lumiera::Time Time;
       typedef session::Track* Track;
 
 
diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp
index 48473d298..1dafb2e87 100644
--- a/src/proc/mobject/session.hpp
+++ b/src/proc/mobject/session.hpp
@@ -57,7 +57,7 @@ namespace mobject
   /**
    * The (current) Session holds all the user
    * visible content to be edited and manipulated
-   * within the Cinelerra Application. From a users
+   * within the Lumiera Application. From a users
    * perspective, it is a collection of Media Objects
    * (--> MObject) placed (--> Placement) onto virtual
    * Tracks.
diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp
index dfc7f8696..c42d5bc3d 100644
--- a/src/proc/mobject/session/locatingpin.hpp
+++ b/src/proc/mobject/session/locatingpin.hpp
@@ -42,7 +42,7 @@
 #define MOBJECT_SESSION_LOCATINGPIN_H
 
 
-#include "cinelerra.h"
+#include "lumiera.h"
 
 #include <utility>
 #include <boost/scoped_ptr.hpp>
@@ -79,7 +79,7 @@ namespace mobject
     class LocatingPin
       {
       protected:
-        typedef cinelerra::Time Time;
+        typedef lumiera::Time Time;
         typedef session::Track* Track;
         typedef std::pair<Time,Track> SolutionData;  //TODO (ichthyo consideres better passing of solution by subclass)
         struct LocatingSolution;
diff --git a/src/proc/mobject/session/segment.hpp b/src/proc/mobject/session/segment.hpp
index 46b5929d4..0b8a6025b 100644
--- a/src/proc/mobject/session/segment.hpp
+++ b/src/proc/mobject/session/segment.hpp
@@ -26,7 +26,7 @@
 
 #include <list>
 
-#include "cinelerra.h"
+#include "lumiera.h"
 #include "proc/mobject/explicitplacement.hpp"
 
 
@@ -49,7 +49,7 @@ namespace mobject
     class Segment
       {
       protected:
-        typedef cinelerra::Time Time;
+        typedef lumiera::Time Time;
 
         /** begin of this timeline segment. */
         Time start;
diff --git a/src/proc/mobject/session/session.cpp b/src/proc/mobject/session/session.cpp
index 2e81d752e..ea6a559d9 100644
--- a/src/proc/mobject/session/session.cpp
+++ b/src/proc/mobject/session/session.cpp
@@ -37,7 +37,7 @@
 #include "common/singleton.hpp"
 
 
-using cinelerra::Singleton;
+using lumiera::Singleton;
 using mobject::session::SessManager;
 using mobject::session::SessManagerImpl;
 
diff --git a/src/proc/mobject/session/sessionimpl.cpp b/src/proc/mobject/session/sessionimpl.cpp
index e0cab87cc..15e940843 100644
--- a/src/proc/mobject/session/sessionimpl.cpp
+++ b/src/proc/mobject/session/sessionimpl.cpp
@@ -60,7 +60,7 @@ namespace mobject
       catch (...)
         {
           focusEDL_ = 0;
-          throw cinelerra::error::Fatal ("unexpected exception while clearing EDLs");
+          throw lumiera::error::Fatal ("unexpected exception while clearing EDLs");
         }
     }
     
diff --git a/src/proc/mobject/session/sessionimpl.hpp b/src/proc/mobject/session/sessionimpl.hpp
index d145c4fe5..2c396f95c 100644
--- a/src/proc/mobject/session/sessionimpl.hpp
+++ b/src/proc/mobject/session/sessionimpl.hpp
@@ -90,7 +90,7 @@ namespace mobject
         boost::scoped_ptr<SessionImpl> pImpl_;
         
         SessManagerImpl()  throw();
-        friend class cinelerra::singleton::StaticCreate<SessManagerImpl>;
+        friend class lumiera::singleton::StaticCreate<SessManagerImpl>;
         
       public:
         virtual void clear () ;
diff --git a/src/tool/hello.c b/src/tool/hello.c
index 62a033f4e..d75f55f94 100644
--- a/src/tool/hello.c
+++ b/src/tool/hello.c
@@ -1,12 +1,12 @@
 /*
  * hello.c - demonstrates how to build a standalone tool (C source) 
- *           integrated into the SCons based build system of Cinelerra
+ *           integrated into the SCons based build system of Lumiera
  */
 
 #include <stdio.h>
 
 int main(int argc, char* argv[])
   {
-    printf("hello cinelerra world");
+    printf("hello lumiera world");
     return 0;
   }
diff --git a/tests/10errorhandling.tests b/tests/10errorhandling.tests
index 2492869c5..f2e4e9dfc 100644
--- a/tests/10errorhandling.tests
+++ b/tests/10errorhandling.tests
@@ -15,12 +15,12 @@ return: 0
 END
 
 TEST "query error" get <<END
-out: CINELERRA_ERROR_TEST:test error
+out: LUMIERA_ERROR_TEST:test error
 return: 0
 END
 
 TEST "error cleared" get2 <<END
-out: CINELERRA_ERROR_TEST:test error
+out: LUMIERA_ERROR_TEST:test error
 out: (nil)
 return: 0
 END
diff --git a/tests/50components.tests b/tests/50components.tests
index 7737d7fce..8ee8f04a6 100644
--- a/tests/50components.tests
+++ b/tests/50components.tests
@@ -52,18 +52,18 @@ END
 
 
 TEST "ExceptionError_test" ExceptionError_test <<END
-out: caught: CINELERRA_ERROR_LIFE_AND_UNIVERSE:and everything? (don't panic)...the answer is: 42
-out: caught cinelerra::Error: CINELERRA_ERROR_DERIVED:convoluted exception
-out: caught error::Logic: CINELERRA_ERROR_FATAL:floundered (test-2).
-out: caught error::Invalid: CINELERRA_ERROR_INVALID:invalid input or parameters (test-3).
-out: caught cinelerra::Error: CINELERRA_ERROR_EXTERNAL:failure in external service (test-4).
+out: caught: LUMIERA_ERROR_LIFE_AND_UNIVERSE:and everything? (don't panic)...the answer is: 42
+out: caught lumiera::Error: LUMIERA_ERROR_DERIVED:convoluted exception
+out: caught error::Logic: LUMIERA_ERROR_FATAL:floundered (test-2).
+out: caught error::Invalid: LUMIERA_ERROR_INVALID:invalid input or parameters (test-3).
+out: caught lumiera::Error: LUMIERA_ERROR_EXTERNAL:failure in external service (test-4).
 out: caught std::runtime_error: test-5
 out: caught std::exception: St9exception
-out: intermediate handler caught: CINELERRA_ERROR_EXTERNAL:failure in external service (test-7).....will rethrow as error::State
-out: caught cinelerra::Error: CINELERRA_ERROR_STATE:unforseen state -- caused by: CINELERRA_ERROR_EXTERNAL:failure in external service (test-7).
-out: intermediate handler caught: CINELERRA_ERROR_EXTERNAL:failure in external service (test-8).....will rethrow as error::State
-out: 2nd intermediate handler caught: CINELERRA_ERROR_STATE:unforseen state -- caused by: CINELERRA_ERROR_EXTERNAL:failure in external service (test-8).....will rethrow as error::Config
-out: caught cinelerra::Error: CINELERRA_ERROR_CONFIG:misconfiguration -- caused by: CINELERRA_ERROR_EXTERNAL:failure in external service (test-8).
+out: intermediate handler caught: LUMIERA_ERROR_EXTERNAL:failure in external service (test-7).....will rethrow as error::State
+out: caught lumiera::Error: LUMIERA_ERROR_STATE:unforseen state -- caused by: LUMIERA_ERROR_EXTERNAL:failure in external service (test-7).
+out: intermediate handler caught: LUMIERA_ERROR_EXTERNAL:failure in external service (test-8).....will rethrow as error::State
+out: 2nd intermediate handler caught: LUMIERA_ERROR_STATE:unforseen state -- caused by: LUMIERA_ERROR_EXTERNAL:failure in external service (test-8).....will rethrow as error::Config
+out: caught lumiera::Error: LUMIERA_ERROR_CONFIG:misconfiguration -- caused by: LUMIERA_ERROR_EXTERNAL:failure in external service (test-8).
 END
 
 
diff --git a/tests/54builder.tests b/tests/54builder.tests
index ee8718182..3b6825651 100644
--- a/tests/54builder.tests
+++ b/tests/54builder.tests
@@ -4,7 +4,7 @@ TESTING "Component Test Suite: Builder" ./test-components --group=builder
 
 
 TEST "BuilderTool_test" BuilderTool_test <<END
-out: media is: Asset(VIDEO:cin3.test-1 v1)
+out: media is: Asset(VIDEO:lumi.test-1 v1)
 out: catch-all-function called.
 END
 
diff --git a/tests/components/backend/mediaaccessmock.cpp b/tests/components/backend/mediaaccessmock.cpp
index 071ad5cef..d54a4978d 100644
--- a/tests/components/backend/mediaaccessmock.cpp
+++ b/tests/components/backend/mediaaccessmock.cpp
@@ -41,7 +41,7 @@
 #include <vector>
 #include <map>
 
-using cinelerra::error::Invalid;
+using lumiera::error::Invalid;
 using util::for_each;
 using util::isnil;
 using std::cout;
diff --git a/tests/components/backend/mediaaccessmock.hpp b/tests/components/backend/mediaaccessmock.hpp
index e11d0a67a..06eedad5c 100644
--- a/tests/components/backend/mediaaccessmock.hpp
+++ b/tests/components/backend/mediaaccessmock.hpp
@@ -41,7 +41,7 @@ namespace backend_interface
     class MediaAccessMock : public MediaAccessFacade
       {
       public:
-        FileHandle queryFile (const char* name)  throw(cinelerra::error::Invalid);
+        FileHandle queryFile (const char* name)  throw(lumiera::error::Invalid);
         ChanDesc queryChannel (FileHandle, uint chanNo)  throw();
       };
 
diff --git a/tests/components/common/appconfigtest.cpp b/tests/components/common/appconfigtest.cpp
index d65e29402..6cab57de8 100644
--- a/tests/components/common/appconfigtest.cpp
+++ b/tests/components/common/appconfigtest.cpp
@@ -33,7 +33,7 @@ using std::cout;
 
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -46,10 +46,10 @@ namespace cinelerra
             testAccess("version");
           }
         
-        /** @test accessing a value from cinelerra::Appconfig */
+        /** @test accessing a value from lumiera::Appconfig */
         void testAccess (const string& key)
         {
-          string ver = cinelerra::Appconfig::get(key);
+          string ver = lumiera::Appconfig::get(key);
           ASSERT ( !util::isnil(ver));
         }
       };
diff --git a/tests/components/common/exceptionerrortest.cpp b/tests/components/common/exceptionerrortest.cpp
index 987c77d19..75a13d0ee 100644
--- a/tests/components/common/exceptionerrortest.cpp
+++ b/tests/components/common/exceptionerrortest.cpp
@@ -42,7 +42,7 @@ using std::cout;
 
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -50,11 +50,11 @@ namespace cinelerra
     /** local specific error-constant for use in the 
      *  construcor of the nested SpecificError class.
      */
-    CINELERRA_ERROR_DEFINE(LIFE_AND_UNIVERSE, "and everything?");
-    CINELERRA_ERROR_DEFINE(DERIVED, "convoluted exception");
+    LUMIERA_ERROR_DEFINE(LIFE_AND_UNIVERSE, "and everything?");
+    LUMIERA_ERROR_DEFINE(DERIVED, "convoluted exception");
     
     /** declare a specific Error class with parent class error::external */
-    CINELERRA_EXCEPTION_DECLARE (DerivedError, error::External,  CINELERRA_ERROR_DERIVED);
+    LUMIERA_EXCEPTION_DECLARE (DerivedError, error::External,  LUMIERA_ERROR_DERIVED);
     
     
     /**********************************************************
@@ -134,29 +134,29 @@ namespace cinelerra
         }
         
         
-        /** @test by constructing an cinelerra::Error object,
-         *  the corresponding cinelerra_error state is set automatically
+        /** @test by constructing an lumiera::Error object,
+         *  the corresponding lumiera_error state is set automatically
          */
         void checkErrorIntegration()
         {
-          cinelerra_error ();
-          ASSERT (!cinelerra_error ());
+          lumiera_error ();
+          ASSERT (!lumiera_error ());
           
           Error err1;
-          Error err2("boo",CINELERRA_ERROR_DERIVED);
-          ASSERT (err1.getID () == cinelerra_error ()); // (we didn't clear the first one!)
+          Error err2("boo",LUMIERA_ERROR_DERIVED);
+          ASSERT (err1.getID () == lumiera_error ()); // (we didn't clear the first one!)
           
-          Error err3("boooo",CINELERRA_ERROR_DERIVED);
-          ASSERT (err3.getID () == cinelerra_error ());
+          Error err3("boooo",LUMIERA_ERROR_DERIVED);
+          ASSERT (err3.getID () == lumiera_error ());
           
           SpecificError err4;
-          ASSERT (err4.getID () == CINELERRA_ERROR_LIFE_AND_UNIVERSE);
-          ASSERT (err4.getID () == cinelerra_error ());
+          ASSERT (err4.getID () == LUMIERA_ERROR_LIFE_AND_UNIVERSE);
+          ASSERT (err4.getID () == lumiera_error ());
           
-          ASSERT (!cinelerra_error ());
+          ASSERT (!lumiera_error ());
         }
         
-        /** @test the chaining of cinelerra::Exception objects
+        /** @test the chaining of lumiera::Exception objects
          *  and the retrieval of the original root cause.
          */
         void checkRootCauseChaining()
@@ -186,7 +186,7 @@ namespace cinelerra
          *        gets installed and invoked, which gives additional diagnostics.*/
         void terminateUnknown ()  throw() 
         {
-          cinelerra::Appconfig::instance();
+          lumiera::Appconfig::instance();
           // will cause initialisation of Appconfig,
           
           throw Error("You'll never get me, won't you?");
@@ -201,7 +201,7 @@ namespace cinelerra
           {
             int value;
           public:
-            SpecificError () : Invalid("don't panic",CINELERRA_ERROR_LIFE_AND_UNIVERSE), value(42) {}
+            SpecificError () : Invalid("don't panic",LUMIERA_ERROR_LIFE_AND_UNIVERSE), value(42) {}
             int revealIt ()   { return value; }
           };
         
@@ -220,7 +220,7 @@ namespace cinelerra
           catch (SpecificError& e) { cout << "caught: " << e.what() << "..the answer is: " << e.revealIt() << "\n"; }                
           catch (error::Logic&  e) { cout << "caught error::Logic: " << e.what() << "\n"; }                
           catch (error::Invalid&e) { cout << "caught error::Invalid: " << e.what() << "\n"; }                
-          catch (Error&         e) { cout << "caught cinelerra::Error: " << e.what() << "\n"; }                
+          catch (Error&         e) { cout << "caught lumiera::Error: " << e.what() << "\n"; }                
           catch (runtime_error& e) { cout << "caught std::runtime_error: " << e.what() << "\n"; }                
           catch (exception&     e) { cout << "caught std::exception: " << e.what() << "\n"; }
           catch (...)              { cout << "caught an unknown exception\n"; }
diff --git a/tests/components/common/factoryspecialtest.cpp b/tests/components/common/factoryspecialtest.cpp
index de9eeee8b..ecf293cd9 100644
--- a/tests/components/common/factoryspecialtest.cpp
+++ b/tests/components/common/factoryspecialtest.cpp
@@ -38,7 +38,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -323,4 +323,4 @@ namespace cinelerra
     
   } // namespace test
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/common/factorytest.cpp b/tests/components/common/factorytest.cpp
index 875266fce..6c96a337c 100644
--- a/tests/components/common/factorytest.cpp
+++ b/tests/components/common/factorytest.cpp
@@ -36,7 +36,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -100,7 +100,7 @@ namespace cinelerra
      *       further shared-ptrs, invoke a member function and
      *       finally, when leaving the scope, our TargetObj
      *       will be destroyed automatically.
-     * @see  cinelerra::Factory
+     * @see  lumiera::Factory
      */
     class Factory_test : public Test
       {
@@ -125,4 +125,4 @@ namespace cinelerra
     
   } // namespace test
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/common/singletontest.cpp b/tests/components/common/singletontest.cpp
index 558d7e674..b531d7e9c 100644
--- a/tests/components/common/singletontest.cpp
+++ b/tests/components/common/singletontest.cpp
@@ -38,7 +38,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -72,9 +72,9 @@ namespace cinelerra
     /*******************************************************************
      * @test implement a Singleton class using our Singleton Template.
      * Expected results: no memory leaks.
-     * @see  cinelerra::Singleton
-     * @see  cinelerra::singleton::StaticCreate
-     * @see  cinelerra::singleton::HeapCreate
+     * @see  lumiera::Singleton
+     * @see  lumiera::singleton::StaticCreate
+     * @see  lumiera::singleton::HeapCreate
      */
     class Singleton_test : public Test
       {
@@ -136,4 +136,4 @@ namespace cinelerra
     
   } // namespace test
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/common/singletontestmocktest.cpp b/tests/components/common/singletontestmocktest.cpp
index b90b1a73c..ea5e1d70e 100644
--- a/tests/components/common/singletontestmocktest.cpp
+++ b/tests/components/common/singletontestmocktest.cpp
@@ -37,7 +37,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -108,8 +108,8 @@ namespace cinelerra
      * @test inject a Mock object into the Singleton Factory, 
      *       to be returned and used in place of the original object.
      * Expected results: Mock(s) called, no memory leaks.
-     * @see  cinelerra::Singleton
-     * @see  cinelerra::singleton::Static
+     * @see  lumiera::Singleton
+     * @see  lumiera::singleton::Static
      */
     class SingletonTestMock_test : public Test
       {
@@ -214,4 +214,4 @@ namespace cinelerra
 
   } // namespace test
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/common/testtargetobj.hpp b/tests/components/common/testtargetobj.hpp
index 8a0728b95..28ac5890d 100644
--- a/tests/components/common/testtargetobj.hpp
+++ b/tests/components/common/testtargetobj.hpp
@@ -21,8 +21,8 @@
 */
 
 
-#ifndef CINELERRA_TEST_TESTTARGETOBJ_H
-#define CINELERRA_TEST_TESTTARGETOBJ_H
+#ifndef LUMIERA_TEST_TESTTARGETOBJ_H
+#define LUMIERA_TEST_TESTTARGETOBJ_H
 
 
 #include "common/test/run.hpp"
@@ -41,7 +41,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -107,5 +107,5 @@ namespace cinelerra
     
   } // namespace test
 
-} // namespace cinelerra
+} // namespace lumiera
 #endif
diff --git a/tests/components/common/typelisttest.cpp b/tests/components/common/typelisttest.cpp
index 1a2e383e8..42159d96c 100644
--- a/tests/components/common/typelisttest.cpp
+++ b/tests/components/common/typelisttest.cpp
@@ -30,7 +30,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace typelist
     {
@@ -97,4 +97,4 @@ namespace cinelerra
     
   } // namespace typelist
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/common/visitingtoolconcept.cpp b/tests/components/common/visitingtoolconcept.cpp
index 16578b6be..f2189ed09 100644
--- a/tests/components/common/visitingtoolconcept.cpp
+++ b/tests/components/common/visitingtoolconcept.cpp
@@ -24,7 +24,7 @@
 /** @file visitingtoolconept.cpp
  ** While laying the foundations for EDL and Builder, Ichthyo came accross 
  ** the necessity to create a custom implementation of the Visitor Pattern
- ** optimally suited for Cinelerra's needs. This implementation file was 
+ ** optimally suited for Lumiera's needs. This implementation file was 
  ** used for the draft and is self-contained. The final solution was then
  ** extracted as library implementation to visitor.hpp 
  **
@@ -60,13 +60,13 @@
 #include <iostream>
 #include <vector>
 
-using cinelerra::Singleton;
+using lumiera::Singleton;
 using boost::format;
 using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace visitor_concept_draft
     {
@@ -459,4 +459,4 @@ namespace cinelerra
     
   } // namespace visitor_concept_draft
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/common/visitingtoolextendedtest.cpp b/tests/components/common/visitingtoolextendedtest.cpp
index a25ebd95a..d29c60b26 100644
--- a/tests/components/common/visitingtoolextendedtest.cpp
+++ b/tests/components/common/visitingtoolextendedtest.cpp
@@ -32,7 +32,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace visitor
     {
@@ -226,4 +226,4 @@ namespace cinelerra
     
   } // namespace visitor
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/common/visitingtooltest.cpp b/tests/components/common/visitingtooltest.cpp
index 10edf233d..0263d9c88 100644
--- a/tests/components/common/visitingtooltest.cpp
+++ b/tests/components/common/visitingtooltest.cpp
@@ -32,7 +32,7 @@ using std::string;
 using std::cout;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace visitor
     {
@@ -159,4 +159,4 @@ namespace cinelerra
     
   } // namespace visitor
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/helloworldtest.cpp b/tests/components/helloworldtest.cpp
index 8398f19ad..d0c289986 100644
--- a/tests/components/helloworldtest.cpp
+++ b/tests/components/helloworldtest.cpp
@@ -31,7 +31,7 @@ using util::isnil;
 using boost::lexical_cast;
 
 
-namespace cinelerra
+namespace lumiera
   {
   namespace test
     {
@@ -65,4 +65,4 @@ namespace cinelerra
     
   } // namespace test
 
-} // namespace cinelerra
+} // namespace lumiera
diff --git a/tests/components/mainsuite.cpp b/tests/components/mainsuite.cpp
index 924a982e3..aa500cdbe 100644
--- a/tests/components/mainsuite.cpp
+++ b/tests/components/mainsuite.cpp
@@ -1,5 +1,5 @@
 /*
-  mainsuite.cpp  -  "the" cinelerra3 self test suite
+  mainsuite.cpp  -  "the" Lumiera self test suite
 
   Copyright (C)         Lumiera.org
     2008,               Christian Thaeter <ct@pipapo.org>
diff --git a/tests/components/proc/asset/createassettest.cpp b/tests/components/proc/asset/createassettest.cpp
index fa28d4472..d9302fc7c 100644
--- a/tests/components/proc/asset/createassettest.cpp
+++ b/tests/components/proc/asset/createassettest.cpp
@@ -100,14 +100,14 @@ namespace asset
                 aMang.getAsset (ID<asset::Proc>(mm1->getID()));
                 NOTREACHED;
               }
-            catch (cinelerra::error::Invalid& xxx) {ASSERT (xxx.getID()==CINELERRA_ERROR_WRONG_ASSET_KIND);}
+            catch (lumiera::error::Invalid& xxx) {ASSERT (xxx.getID()==LUMIERA_ERROR_WRONG_ASSET_KIND);}
             try 
               { // try accessing nonexistant ID 
                 aMang.getAsset (ID<Asset> (1234567890));
                 NOTREACHED;
               }
-            catch (cinelerra::error::Invalid& xxx) {ASSERT (xxx.getID()==CINELERRA_ERROR_UNKNOWN_ASSET_ID);}
-            cinelerra_error (); // reset errorflag
+            catch (lumiera::error::Invalid& xxx) {ASSERT (xxx.getID()==LUMIERA_ERROR_UNKNOWN_ASSET_ID);}
+            lumiera_error (); // reset errorflag
             
             
             // checking the Ident-Fields
@@ -121,8 +121,8 @@ namespace asset
             ASSERT (mm3->ident.category == Category (VIDEO       ));
 
             ASSERT (mm1->ident.org == "ichthyo");
-            ASSERT (mm2->ident.org == "cin3");
-            ASSERT (mm3->ident.org == "cin3");
+            ASSERT (mm2->ident.org == "lumi");
+            ASSERT (mm3->ident.org == "lumi");
 
             ASSERT (mm1->ident.version == 5);
             ASSERT (mm2->ident.version == 1);
@@ -159,19 +159,19 @@ namespace asset
             ASSERT (key2.name == "testfile2"); // name filled in automatically 
 
             candi = asset::Media::create(string("testfile3.wav"), Category(AUDIO));
-            ASSERT ( checkProperties (candi, Asset::Ident("testfile3", Category(AUDIO), "cin3", 1)
+            ASSERT ( checkProperties (candi, Asset::Ident("testfile3", Category(AUDIO), "lumi", 1)
                                            , "testfile3.wav"));
 
             candi = asset::Media::create("some/path/testfile4.wav", Category(AUDIO));
-            ASSERT ( checkProperties (candi, Asset::Ident("testfile4", Category(AUDIO), "cin3", 1)
+            ASSERT ( checkProperties (candi, Asset::Ident("testfile4", Category(AUDIO), "lumi", 1)
                                            , "some/path/testfile4.wav"));
 
             candi = asset::Media::create("", Category(AUDIO,"sub/bin"));
-            ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO,"sub/bin"), "cin3", 1)
+            ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO,"sub/bin"), "lumi", 1)
                                            , ""));
 
             candi = asset::Media::create("", AUDIO);
-            ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO), "cin3", 1)
+            ASSERT ( checkProperties (candi, Asset::Ident("nil", Category(AUDIO), "lumi", 1)
                                            , ""));
           }
         
diff --git a/tests/components/proc/asset/mediastructurequerytest.cpp b/tests/components/proc/asset/mediastructurequerytest.cpp
index 866178fd4..7cbfcd847 100644
--- a/tests/components/proc/asset/mediastructurequerytest.cpp
+++ b/tests/components/proc/asset/mediastructurequerytest.cpp
@@ -44,7 +44,7 @@ namespace asset
     
     /***********************************************************************
      * This test documents the Interface used by MediaFactory when loading
-     * media files for querying cinelerra's backend layer for information
+     * media files for querying Lumiera's backend layer for information
      * on how the media file is structured.
      */
     class MediaStructureQuery_test : public Test
diff --git a/tests/components/proc/mobject/controller/rendersegmenttest.cpp b/tests/components/proc/mobject/controller/rendersegmenttest.cpp
index fac5568aa..a56c76480 100644
--- a/tests/components/proc/mobject/controller/rendersegmenttest.cpp
+++ b/tests/components/proc/mobject/controller/rendersegmenttest.cpp
@@ -46,7 +46,7 @@ namespace mobject
       /*******************************************************************
        * @test create a render process from a given segment of the EDL.
        *       Basically this includes cooperation of all parts of the
-       *       Cinelerra Proc Layer. For a prepared test-EDL we invoke the
+       *       Lumiera Proc Layer. For a prepared test-EDL we invoke the
        *       controller to create a render process. This includes building
        *       the render pipeline. Finally, we analyze all the created 
        *       Structures. 
diff --git a/tests/components/proc/mobject/placementbasictest.cpp b/tests/components/proc/mobject/placementbasictest.cpp
index 16b6a80d0..e3e237252 100644
--- a/tests/components/proc/mobject/placementbasictest.cpp
+++ b/tests/components/proc/mobject/placementbasictest.cpp
@@ -35,7 +35,7 @@
 #include <iostream>
 
 //using boost::format;
-using cinelerra::Time;
+using lumiera::Time;
 using util::contains;
 using std::string;
 using std::cout;
diff --git a/tests/components/proc/mobject/session/addcliptest.cpp b/tests/components/proc/mobject/session/addcliptest.cpp
index ffb794e95..3cb981270 100644
--- a/tests/components/proc/mobject/session/addcliptest.cpp
+++ b/tests/components/proc/mobject/session/addcliptest.cpp
@@ -32,7 +32,7 @@
 #include <iostream>
 
 //using boost::format;
-using cinelerra::Time;
+using lumiera::Time;
 using util::contains;
 using std::string;
 using std::cout;
diff --git a/tests/components/proc/mobject/session/testclip.cpp b/tests/components/proc/mobject/session/testclip.cpp
index ce659e708..ea17dd19d 100644
--- a/tests/components/proc/mobject/session/testclip.cpp
+++ b/tests/components/proc/mobject/session/testclip.cpp
@@ -44,7 +44,7 @@ namespace mobject
       asset::Media & 
       createTestMedia ()
       {
-        // install Mock-Interface to cinelerra backend
+        // install Mock-Interface to Lumiera backend
         MAF::instance.injectSubclass (new MediaAccessMock);
         PM media = asset::Media::create("test-2", VIDEO); // query magic filename
         MAF::instance.injectSubclass (0); // remove Mock-Interface
@@ -70,7 +70,7 @@ namespace mobject
             { }
         };
           
-      cinelerra::Singleton<Testbed> testbed_1; // invoke ctor when creating first TestClip... 
+      lumiera::Singleton<Testbed> testbed_1; // invoke ctor when creating first TestClip... 
 
       
       
diff --git a/tests/error/errortest.c b/tests/error/errortest.c
index 0fd95b600..d367c0742 100644
--- a/tests/error/errortest.c
+++ b/tests/error/errortest.c
@@ -25,7 +25,7 @@
 #include "lib/error.h"
 
 
-CINELERRA_ERROR_DEFINE(TEST, "test error");
+LUMIERA_ERROR_DEFINE(TEST, "test error");
 
 int
 main (int argc, char** argv)
@@ -35,31 +35,31 @@ main (int argc, char** argv)
 
   if (!strcmp(argv[1], "set"))
     {
-      cinelerra_error_set (CINELERRA_ERROR_TEST);
+      lumiera_error_set (LUMIERA_ERROR_TEST);
     }
 
   if (!strcmp(argv[1], "get_no"))
     {
       const char* err;
-      err = cinelerra_error ();
+      err = lumiera_error ();
       printf ("%p\n", err);
     }
 
   if (!strcmp(argv[1], "get"))
     {
-      cinelerra_error_set (CINELERRA_ERROR_TEST);
+      lumiera_error_set (LUMIERA_ERROR_TEST);
       const char* err;
-      err = cinelerra_error ();
+      err = lumiera_error ();
       printf ("%s\n", err);
     }
 
   if (!strcmp(argv[1], "get2"))
     {
-      cinelerra_error_set (CINELERRA_ERROR_TEST);
+      lumiera_error_set (LUMIERA_ERROR_TEST);
       const char* err;
-      err = cinelerra_error ();
+      err = lumiera_error ();
       printf ("%s\n", err);
-      err = cinelerra_error ();
+      err = lumiera_error ();
       printf ("%p\n", err);
     }
 
diff --git a/tests/library/test-llist.c b/tests/library/test-llist.c
index bf6c5aed5..bfaf99c65 100644
--- a/tests/library/test-llist.c
+++ b/tests/library/test-llist.c
@@ -26,7 +26,7 @@
 #include "lib/framerate.h"
 
 
-CINELERRA_ERROR_DEFINE(TEST, "test error");
+LUMIERA_ERROR_DEFINE(TEST, "test error");
 
 int
 main (int argc, char** argv)
diff --git a/tests/library/test-references.c b/tests/library/test-references.c
index f56c7c9d7..c1509c341 100644
--- a/tests/library/test-references.c
+++ b/tests/library/test-references.c
@@ -25,7 +25,7 @@
 #include "lib/references.h"
 
 
-CINELERRA_ERROR_DEFINE(TEST, "test error");
+LUMIERA_ERROR_DEFINE(TEST, "test error");
 
 
 struct example
@@ -55,16 +55,16 @@ main (int argc, char** argv)
       struct example test;
       test.foo = 123;
 
-      cinelerra_reference hold;
+      lumiera_reference hold;
 
-      cinelerra_reference_strong_init_once (&hold, &test, example_dtor);
+      lumiera_reference_strong_init_once (&hold, &test, example_dtor);
 
 
-      struct example* r = cinelerra_reference_get (&hold);
+      struct example* r = lumiera_reference_get (&hold);
 
       printf ("got: %d\n", r->foo);
 
-      cinelerra_reference_destroy (&hold);
+      lumiera_reference_destroy (&hold);
     }
   else if (!strcmp(argv[1], "nodeinsert"))
     {
diff --git a/tests/locking/condition.c b/tests/locking/condition.c
index 6483ac0a9..7d79e9a7e 100644
--- a/tests/locking/condition.c
+++ b/tests/locking/condition.c
@@ -40,10 +40,10 @@ signaling_thread()
 int
 conditionforgotunlock ()
 {
-  cinelerra_condition c;
-  cinelerra_condition_init (&c);
+  lumiera_condition c;
+  lumiera_condition_init (&c);
 
-  cinelerra_conditionacquirer l;
-  cinelerra_conditionacquirer_init (&l, &c, CINELERRA_LOCKED);
+  lumiera_conditionacquirer l;
+  lumiera_conditionacquirer_init (&l, &c, LUMIERA_LOCKED);
   return 0;
 }
diff --git a/tests/locking/mutex.c b/tests/locking/mutex.c
index ed6a050eb..f4f8c18f6 100644
--- a/tests/locking/mutex.c
+++ b/tests/locking/mutex.c
@@ -23,10 +23,10 @@
 
 int mutexforgotunlock()
 {
-  cinelerra_mutex m;
-  cinelerra_mutex_init (&m);
+  lumiera_mutex m;
+  lumiera_mutex_init (&m);
 
-  cinelerra_mutexacquirer l;
-  cinelerra_mutexacquirer_init_mutex (&l, &m, CINELERRA_LOCKED);
+  lumiera_mutexacquirer l;
+  lumiera_mutexacquirer_init_mutex (&l, &m, LUMIERA_LOCKED);
   return 0;
 }
diff --git a/tests/locking/test-condition.c b/tests/locking/test-condition.c
index cc8e5ae14..1e3ca1bf7 100644
--- a/tests/locking/test-condition.c
+++ b/tests/locking/test-condition.c
@@ -24,7 +24,7 @@
 
 #include "lib/condition.h"
 
-CINELERRA_ERROR_DEFINE(TEST, "test error");
+LUMIERA_ERROR_DEFINE(TEST, "test error");
 
 #if 0
 waiting_thread()
@@ -52,11 +52,11 @@ main (int argc, char** argv)
 
   if (!strcmp(argv[1], "conditionforgotunlock"))
     {
-      cinelerra_condition c;
-      cinelerra_condition_init (&c);
+      lumiera_condition c;
+      lumiera_condition_init (&c);
 
-      cinelerra_conditionlock NOBUG_CLEANUP(cinelerra_conditionlock_ensureunlocked) l;
-      cinelerra_conditionlock_init (&l, &c, CINELERRA_LOCKED);
+      lumiera_conditionlock NOBUG_CLEANUP(lumiera_conditionlock_ensureunlocked) l;
+      lumiera_conditionlock_init (&l, &c, LUMIERA_LOCKED);
     }
   else
     return 1;
diff --git a/tests/locking/test-locking.c b/tests/locking/test-locking.c
index 46455764b..1b54d152e 100644
--- a/tests/locking/test-locking.c
+++ b/tests/locking/test-locking.c
@@ -24,7 +24,7 @@
 
 #include "lib/error.h"
 
-CINELERRA_ERROR_DEFINE(TEST, "test error");
+LUMIERA_ERROR_DEFINE(TEST, "test error");
 
 int conditionforgotunlock ();
 int mutexforgotunlock ();
diff --git a/tests/plugin/example_plugin.c b/tests/plugin/example_plugin.c
index ebb71ae8a..7540aa35d 100644
--- a/tests/plugin/example_plugin.c
+++ b/tests/plugin/example_plugin.c
@@ -34,12 +34,12 @@ void bye(const char* m)
   printf("Bye %s\n", m);
 }
 
-CINELERRA_INTERFACE_IMPLEMENT(hello, 1, german, myopen, myclose,
-                              hallo,
-                              tschuess
-                              );
+LUMIERA_INTERFACE_IMPLEMENT(hello, 1, german, myopen, myclose,
+                            hallo,
+                            tschuess
+                            );
 
-CINELERRA_INTERFACE_IMPLEMENT(hello, 1, english, myopen, myclose,
-                              hello,
-                              bye
-                              );
+LUMIERA_INTERFACE_IMPLEMENT(hello, 1, english, myopen, myclose,
+                            hello,
+                            bye
+                            );
diff --git a/tests/plugin/example_plugin.cpp b/tests/plugin/example_plugin.cpp
index b608887d8..aba34b44a 100644
--- a/tests/plugin/example_plugin.cpp
+++ b/tests/plugin/example_plugin.cpp
@@ -50,12 +50,12 @@ public:
 };
 
 
-CINELERRA_INTERFACE_IMPLEMENT(hello, 1, german, example_plugin_de::myopen, example_plugin_de::myclose,
-                              example_plugin_de::hello,
-                              example_plugin_de::bye
-                              );
+LUMIERA_INTERFACE_IMPLEMENT(hello, 1, german, example_plugin_de::myopen, example_plugin_de::myclose,
+                            example_plugin_de::hello,
+                            example_plugin_de::bye
+                           );
 
-CINELERRA_INTERFACE_IMPLEMENT(hello, 1, english, example_plugin_en::myopen, example_plugin_en::myclose,
-                              example_plugin_en::hello,
-                              example_plugin_en::bye
-                              );
+LUMIERA_INTERFACE_IMPLEMENT(hello, 1, english, example_plugin_en::myopen, example_plugin_en::myclose,
+                            example_plugin_en::hello,
+                            example_plugin_en::bye
+                           );
diff --git a/tests/plugin/hello_interface.h b/tests/plugin/hello_interface.h
index ccec270ed..d5cf99ea5 100644
--- a/tests/plugin/hello_interface.h
+++ b/tests/plugin/hello_interface.h
@@ -1,6 +1,6 @@
 #include "lib/plugin.h"
 
-CINELERRA_INTERFACE(hello, 1,
-                    CINELERRA_INTERFACE_PROTO(void, hello, (void))
-                    CINELERRA_INTERFACE_PROTO(void, goodbye, (const char*))
-                    );
+LUMIERA_INTERFACE(hello, 1,
+                  LUMIERA_INTERFACE_PROTO(void, hello, (void))
+                  LUMIERA_INTERFACE_PROTO(void, goodbye, (const char*))
+                  );
diff --git a/tests/plugin/plugin_main.c b/tests/plugin/plugin_main.c
index e691438b3..2efe32471 100644
--- a/tests/plugin/plugin_main.c
+++ b/tests/plugin/plugin_main.c
@@ -12,7 +12,7 @@ main(int argc, char** argv)
   if (argc < 2)
     return -1;
 
-  cinelerra_init_plugin ();
+  lumiera_init_plugin ();
   /*
     we have a plugin 'hello_1' which provides us 2 hello interfaces, one for english and one for german output,
     open both try them, close them.
@@ -22,47 +22,47 @@ main(int argc, char** argv)
 
   if( !strcmp(argv[1],"C"))
     {
-      CINELERRA_INTERFACE_TYPE(hello, 1)* hello_de =
-        (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "german_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1)));
+      LUMIERA_INTERFACE_TYPE(hello, 1)* hello_de =
+        (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin", "german_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1)));
 
-      if (!hello_de) CINELERRA_DIE;
+      if (!hello_de) LUMIERA_DIE;
 
       hello_de->hello();
       hello_de->goodbye(argv[1]);
 
-      CINELERRA_INTERFACE_TYPE(hello, 1)* hello_en =
-        (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "english_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1)));
+      LUMIERA_INTERFACE_TYPE(hello, 1)* hello_en =
+        (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin", "english_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1)));
 
-      if (!hello_en) CINELERRA_DIE;
+      if (!hello_en) LUMIERA_DIE;
 
       hello_en->hello();
       hello_en->goodbye(argv[1]);
 
-      cinelerra_interface_close (hello_en);
-      cinelerra_interface_close (hello_de);
+      lumiera_interface_close (hello_en);
+      lumiera_interface_close (hello_de);
     }
 
   if( !strcmp(argv[1],"C++"))
     {
       /* same again for a plugin written in C++ */
-      CINELERRA_INTERFACE_TYPE(hello, 1)* hello_de =
-        (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin_cpp", "german_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1)));
+      LUMIERA_INTERFACE_TYPE(hello, 1)* hello_de =
+        (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin_cpp", "german_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1)));
 
-      if (!hello_de) CINELERRA_DIE;
+      if (!hello_de) LUMIERA_DIE;
 
       hello_de->hello();
       hello_de->goodbye(argv[1]);
 
-      CINELERRA_INTERFACE_TYPE(hello, 1)* hello_en =
-        (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin_cpp", "english_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1)));
+      LUMIERA_INTERFACE_TYPE(hello, 1)* hello_en =
+        (LUMIERA_INTERFACE_TYPE(hello, 1)*) lumiera_interface_open ("example_plugin_cpp", "english_1", sizeof(LUMIERA_INTERFACE_TYPE(hello, 1)));
 
-      if (!hello_en) CINELERRA_DIE;
+      if (!hello_en) LUMIERA_DIE;
 
       hello_en->hello();
       hello_en->goodbye(argv[1]);
 
-      cinelerra_interface_close (hello_en);
-      cinelerra_interface_close (hello_de);
+      lumiera_interface_close (hello_en);
+      lumiera_interface_close (hello_de);
     }
 
   return 0;
diff --git a/tests/time/test-time.c b/tests/time/test-time.c
index 01dd107ef..e9d8d0550 100644
--- a/tests/time/test-time.c
+++ b/tests/time/test-time.c
@@ -26,7 +26,7 @@
 #include "lib/framerate.h"
 
 
-CINELERRA_ERROR_DEFINE(TEST, "test error");
+LUMIERA_ERROR_DEFINE(TEST, "test error");
 
 int
 main (int argc, char** argv)
@@ -38,106 +38,106 @@ main (int argc, char** argv)
 
   if (!strcmp(argv[1], "init"))
     {
-      cinelerra_time time;
+      lumiera_time time;
 
-      cinelerra_time_init (&time, atol (argv[2]), atol(argv[3]));
+      lumiera_time_init (&time, atol (argv[2]), atol(argv[3]));
 
-      printf ("%lu %lu\n", (long)cinelerra_time_sec (&time), (long)cinelerra_time_usec (&time));
+      printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time));
     }
 
   if (!strcmp(argv[1], "todouble"))
     {
-      cinelerra_time time;
+      lumiera_time time;
 
-      cinelerra_time_init (&time, atol (argv[2]), atol(argv[3]));
+      lumiera_time_init (&time, atol (argv[2]), atol(argv[3]));
 
-      printf ("%g\n", cinelerra_time_double_get (&time));
+      printf ("%g\n", lumiera_time_double_get (&time));
     }
 
   if (!strcmp(argv[1], "todoublenull"))
     {
-      printf ("%g\n", cinelerra_time_double_get (NULL));
+      printf ("%g\n", lumiera_time_double_get (NULL));
     }
 
   if (!strcmp(argv[1], "fromdouble"))
     {
-      cinelerra_time time;
+      lumiera_time time;
 
-      cinelerra_time_set_double (&time, atof (argv[2]));
+      lumiera_time_set_double (&time, atof (argv[2]));
 
-      printf ("%lu %lu\n", (long)cinelerra_time_sec (&time), (long)cinelerra_time_usec (&time));
+      printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time));
     }
 
   if (!strcmp(argv[1], "currenttime"))
     {
-      cinelerra_time time;
+      lumiera_time time;
 
-      cinelerra_time_current (&time);
+      lumiera_time_current (&time);
 
-      printf ("%lu %lu\n", (long)cinelerra_time_sec (&time), (long)cinelerra_time_usec (&time));
+      printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time));
     }
 
   if (!strcmp(argv[1], "add"))
     {
-      cinelerra_time time1, time2;
+      lumiera_time time1, time2;
 
-      cinelerra_time_init (&time1, 0, atol (argv[2]));
-      cinelerra_time_init (&time2, 0, atol (argv[3]));
-      cinelerra_time_add (&time1, &time2);
+      lumiera_time_init (&time1, 0, atol (argv[2]));
+      lumiera_time_init (&time2, 0, atol (argv[3]));
+      lumiera_time_add (&time1, &time2);
 
-      printf ("%lu %lu\n", (long)cinelerra_time_sec (&time1), (long)cinelerra_time_usec (&time1));
+      printf ("%lu %lu\n", (long)lumiera_time_sec (&time1), (long)lumiera_time_usec (&time1));
     }
 
   if (!strcmp(argv[1], "sub"))
     {
-      cinelerra_time time1, time2;
+      lumiera_time time1, time2;
 
-      cinelerra_time_init (&time1, 0, atol (argv[2]));
-      cinelerra_time_init (&time2, 0, atol (argv[3]));
-      cinelerra_time_sub (&time1, &time2);
+      lumiera_time_init (&time1, 0, atol (argv[2]));
+      lumiera_time_init (&time2, 0, atol (argv[3]));
+      lumiera_time_sub (&time1, &time2);
 
-      printf ("%lu %lu\n", (long)cinelerra_time_sec (&time1), (long)cinelerra_time_usec (&time1));
+      printf ("%lu %lu\n", (long)lumiera_time_sec (&time1), (long)lumiera_time_usec (&time1));
     }
 
   if (!strcmp(argv[1], "ntscframefromtime"))
     {
-      cinelerra_framerate ntsc = {30000, 1001};
-      cinelerra_time time;
+      lumiera_framerate ntsc = {30000, 1001};
+      lumiera_time time;
 
-      cinelerra_time_init (&time, atol (argv[2]), atol (argv[3]));
+      lumiera_time_init (&time, atol (argv[2]), atol (argv[3]));
 
-      printf ("%lu\n", (long)cinelerra_framerate_frame_get_time (&ntsc, &time));
+      printf ("%lu\n", (long)lumiera_framerate_frame_get_time (&ntsc, &time));
     }
 
   if (!strcmp(argv[1], "ntscframestart"))
     {
-      cinelerra_framerate ntsc = {30000, 1001};
-      cinelerra_time time;
+      lumiera_framerate ntsc = {30000, 1001};
+      lumiera_time time;
 
-      if(cinelerra_framerate_time_get_time_frame (&ntsc, &time, atol (argv[2])))
-        printf ("%lu %lu\n", (long)cinelerra_time_sec(&time), (long)cinelerra_time_usec(&time));
+      if(lumiera_framerate_time_get_time_frame (&ntsc, &time, atol (argv[2])))
+        printf ("%lu %lu\n", (long)lumiera_time_sec(&time), (long)lumiera_time_usec(&time));
     }
 
   if (!strcmp(argv[1], "ntscframecheck"))
     {
-      cinelerra_framerate ntsc = {30000, 1001};
-      cinelerra_time time1;
-      cinelerra_time time2;
-      cinelerra_framepos frame;
+      lumiera_framerate ntsc = {30000, 1001};
+      lumiera_time time1;
+      lumiera_time time2;
+      lumiera_framepos frame;
 
-      cinelerra_framepos frame1;
-      cinelerra_framepos frame2;
+      lumiera_framepos frame1;
+      lumiera_framepos frame2;
 
       frame = atol (argv[2]);
 
 
-      if (cinelerra_framerate_time_get_time_frame (&ntsc, &time1, frame))
+      if (lumiera_framerate_time_get_time_frame (&ntsc, &time1, frame))
         {
-          printf("frame %lu ", frame1 = cinelerra_framerate_frame_get_time (&ntsc, &time1));
+          printf("frame %lu ", frame1 = lumiera_framerate_frame_get_time (&ntsc, &time1));
 
-          cinelerra_time_init (&time2, 0, 1);
-          cinelerra_time_sub (&time1, &time2);
-          printf("%lu\n", frame2 = cinelerra_framerate_frame_get_time (&ntsc, &time1));
+          lumiera_time_init (&time2, 0, 1);
+          lumiera_time_sub (&time1, &time2);
+          printf("%lu\n", frame2 = lumiera_framerate_frame_get_time (&ntsc, &time1));
           ENSURE (frame1 == frame2+1);
         }
 

From 6596699f6ec0a20be9b66acf5a7456437d7c816b Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 31 Mar 2008 03:21:28 +0200
Subject: [PATCH 12/36] WIP code for handling registration of defaults objects.
 Missing some TODOs and test coverage

---
 src/common/appconfig.cpp                      |   7 -
 src/common/configrules.hpp                    |   2 +-
 src/common/multithread.hpp                    |   1 +
 src/common/query.cpp                          |  23 +-
 src/common/query.hpp                          |   5 +
 src/common/query/mockconfigrules.hpp          |  12 +-
 src/common/util.hpp                           |  33 +++
 src/proc/asset/struct.hpp                     |   6 +-
 src/proc/mobject/session/defsmanager.cpp      |  29 +-
 src/proc/mobject/session/defsmanager.hpp      |  10 +-
 src/proc/mobject/session/defsregistry.cpp     |  48 ----
 src/proc/mobject/session/defsregistry.hpp     | 257 +++++++++++++++++-
 src/proc/mobject/session/session.cpp          |   1 +
 src/proc/mobject/session/sessmanagerimpl.cpp  |   1 +
 .../mobject/session/defsmanagerimpltest.cpp   |   3 +-
 wiki/renderengine.html                        |   4 +-
 16 files changed, 350 insertions(+), 92 deletions(-)
 delete mode 100644 src/proc/mobject/session/defsregistry.cpp

diff --git a/src/common/appconfig.cpp b/src/common/appconfig.cpp
index 612376022..17a245cdf 100644
--- a/src/common/appconfig.cpp
+++ b/src/common/appconfig.cpp
@@ -37,13 +37,6 @@ using util::isnil;
 namespace lumiera
   {
   
-  /** This internal pointer to the single instance is deliberately
-   *  not initialized (i.e. rely on implicit initialisation to 0),
-   *  because when static init reaches this definition, the
-   *  Appconfig::instance() probably already has been called
-   *  by another compilation unit. This is ugliy, but preferable
-   *  to beeing dependant on inclusion order of headers. */
-//  scoped_ptr<Appconfig> Appconfig::theApp_;
 
 #ifndef LUMIERA_VERSION
 #define LUMIERA_VERSION 3++devel
diff --git a/src/common/configrules.hpp b/src/common/configrules.hpp
index a7f0fe37a..890a36a86 100644
--- a/src/common/configrules.hpp
+++ b/src/common/configrules.hpp
@@ -148,7 +148,7 @@ namespace lumiera
          *  @query any goals to be fulfilled by the solution.
          *  @return false if resolution failed. In this case, solution ptr is empty.
          */
-        virtual bool resolve (shared_ptr<TY> solution, const Query<TY>& q) = 0;
+        virtual bool resolve (shared_ptr<TY>& solution, const Query<TY>& q) = 0;
       };
 
     // TODO: the Idea is to provide specialisations for the concrete types
diff --git a/src/common/multithread.hpp b/src/common/multithread.hpp
index 1dbbac519..0e936964c 100644
--- a/src/common/multithread.hpp
+++ b/src/common/multithread.hpp
@@ -27,6 +27,7 @@
 #define LUMIERA_MULTITHREAD_H
 
 #include "nobugcfg.h"
+#include "common/util.hpp"
 
 
 namespace lumiera
diff --git a/src/common/query.cpp b/src/common/query.cpp
index 266c628e5..09c642f1c 100644
--- a/src/common/query.cpp
+++ b/src/common/query.cpp
@@ -33,6 +33,7 @@ using std::map;
 using boost::regex;
 using boost::smatch;
 using boost::regex_search;
+using boost::sregex_iterator;
 using boost::algorithm::is_upper;
 using boost::algorithm::is_alpha;
 
@@ -63,6 +64,9 @@ namespace lumiera
     namespace // Implementation details
       {
       map<Symbol, regex> regexTable;
+      
+      Symbol matchArgument = "\\(\\s*([\\w_\\.\\-]+)\\s*\\)"; 
+      regex findPredicate (string("(\\w+)")+matchArgument);
     }
     
     /** (preliminary) helper: instead of really parsing and evaluating the terms,
@@ -76,7 +80,7 @@ namespace lumiera
     {
       
       if (!contains (regexTable, sym))
-        regexTable[sym] = regex (string(sym)+="\\(\\s*([\\w_\\.\\-]+)\\s*\\)"); 
+        regexTable[sym] = regex (string(sym)+=matchArgument); 
       
       smatch match;
       if (regex_search (termString, match, regexTable[sym]))
@@ -86,6 +90,23 @@ namespace lumiera
     
   } 
   
+    
+    /** @note this is a very hackish preliminary implementation. 
+     *  The regex used will flounder when applied to nested terms. 
+     *  We need a real parser for predicate logic terms (which we
+     *  probably get for free when we embed a prolog system)...
+     */
+    uint 
+    countPraed (const string& q)
+    {
+      uint cnt (0);
+      sregex_iterator end;
+      for (sregex_iterator i (q.begin(),q.end(), findPredicate); 
+           i != end; ++i)
+        ++cnt;
+      return cnt;
+    }
+    
   } // namespace query
     
   
diff --git a/src/common/query.hpp b/src/common/query.hpp
index 591c45c74..b7d22498b 100644
--- a/src/common/query.hpp
+++ b/src/common/query.hpp
@@ -71,6 +71,11 @@ namespace lumiera
     
     const string extractID (Symbol, const string& termString);
 
+    /** count the top-level predicates in the query string.
+     *  usable for ordering queries, as more predicates usually
+     *  mean more conditions, i.e. more constriction
+     */
+    uint countPraed (const string&);
     
   
   } // namespace query
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index 909f7ee50..5a1531cc9 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -111,10 +111,14 @@ namespace lumiera
           {
             const any& entry = fetch_from_table_for (q.asKey());
             if (!isnil (entry))
-              if (! solution
-                 ||(solution && *solution == *candidate)    // simulates a real unification
-                 )
-                return solution = candidate;
+              {
+                const Ret& candidate (any_cast<const Ret&> (entry));
+                if (! solution
+//                   ||(solution && *solution == *candidate)    // simulates a real unification
+//////////////TODO: not only Assets (i.e. define comparison Operators on Assets!)
+                   )
+                  return solution = candidate;
+              }
             
             return solution = Ret();    // fail: return default-constructed empty smart ptr
           }
diff --git a/src/common/util.hpp b/src/common/util.hpp
index a4c3c4b54..d56a45432 100644
--- a/src/common/util.hpp
+++ b/src/common/util.hpp
@@ -124,6 +124,39 @@ namespace util
   }
   
   
+  /** remove all elements fulfilling a given predicate
+   *  from a (sorted) set.
+   *  @return true if anything has been removed. */
+  template<class SET, typename PRD>
+  bool remove_if (SET& set, PRD test)
+    {
+      typedef typename SET::iterator Itor;
+      bool found = false;
+      Itor   end = set.end();
+      Itor begin = set.begin();
+      Itor   pos = begin;
+      while (pos!=end)
+        {
+          if (!test (*pos)) ++pos;
+          else
+            {
+              found = true;
+              if (pos==begin) 
+                {
+                  set.erase(pos);
+                  pos = begin = set.begin();
+                }
+              else
+                {
+                  set.erase(pos--);
+                  ++pos;
+                }
+              end = set.end();
+        }   }
+      return found;
+    }
+  
+  
   /** shortcut for operating on all elements of a container.
    *  Isn't this already defined somewhere? It's so obvious..
    */
diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp
index 25a14ee25..df6c5f1f6 100644
--- a/src/proc/asset/struct.hpp
+++ b/src/proc/asset/struct.hpp
@@ -45,13 +45,13 @@
 #include <boost/scoped_ptr.hpp>
 #include <string>
 
-using std::string;
-using std::wstring;
-using boost::scoped_ptr;
 
 
 namespace asset
   {
+  using std::string;
+  using std::wstring;
+  using boost::scoped_ptr;
   using lumiera::Query;
   
   class Struct;
diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp
index 9188df748..4c5cd9f82 100644
--- a/src/proc/mobject/session/defsmanager.cpp
+++ b/src/proc/mobject/session/defsmanager.cpp
@@ -30,7 +30,6 @@
 
 using boost::format;
 
-using asset::Query;
 using lumiera::ConfigRules;
 using lumiera::query::QueryHandler;
 using lumiera::query::LUMIERA_ERROR_CAPABILITY_QUERY;
@@ -43,13 +42,10 @@ namespace mobject
     using std::tr1::shared_ptr;
     
     
-    namespace // Implementation details
-      {
-      DefsRegistry& defaultsRegistry; //////////////////TODO
-    }
     
     /** initialize the most basic internal defaults. */
     DefsManager::DefsManager ()  throw()
+      : defsRegistry(new DefsRegistry)
     {
       TODO ("setup basic defaults of the session");
     }
@@ -59,7 +55,17 @@ namespace mobject
     shared_ptr<TAR>
     DefsManager::search  (const Query<TAR>& capabilities)
     {
-      defaultsRegistry.get (capabilities);
+      shared_ptr<TAR> res;
+      QueryHandler<TAR>& typeHandler = ConfigRules::instance();  
+      for (DefsRegistry::Iter<TAR> i = defsRegistry->candidates(capabilities); 
+           i.hasNext(); ++i )
+        {
+          shared_ptr<TAR> res (*i);
+          typeHandler.resolve (res, capabilities);
+          if (res)
+            return res;
+        }
+      return res; // "no solution found"
     }
     
     
@@ -71,7 +77,7 @@ namespace mobject
       QueryHandler<TAR>& typeHandler = ConfigRules::instance();  
       typeHandler.resolve (res, capabilities);
       if (res)
-        defaultsRegistry.put (res, capabilities);
+        defsRegistry->put (res, capabilities);
       return res;
     }
     
@@ -86,7 +92,7 @@ namespace mobject
       if (!candidate)
         return false;
       else
-        return defaultsRegistry.put (candidate, capabilities);
+        return defsRegistry->put (candidate, capabilities);
     }
     
     
@@ -94,7 +100,7 @@ namespace mobject
     bool 
     DefsManager::forget  (const shared_ptr<TAR>& defaultObj)
     {
-      defaultsRegistry.forget (defaultObj);
+      return defsRegistry->forget (defaultObj);
     }
 
     
@@ -119,8 +125,9 @@ namespace mobject
   } // namespace mobject::session
 
 } // namespace mobject
-    
-    
+
+
+
    /***************************************************************/
    /* explicit template instantiations for querying various Types */
    /***************************************************************/
diff --git a/src/proc/mobject/session/defsmanager.hpp b/src/proc/mobject/session/defsmanager.hpp
index da98fe6c1..753b452d2 100644
--- a/src/proc/mobject/session/defsmanager.hpp
+++ b/src/proc/mobject/session/defsmanager.hpp
@@ -27,6 +27,8 @@
 
 #include "common/query.hpp"
 
+#include <boost/scoped_ptr.hpp>
+#include <boost/utility.hpp>
 #include <tr1/memory>
 
 
@@ -36,6 +38,9 @@ namespace mobject
   namespace session
     {
     using std::tr1::shared_ptr;
+    using boost::scoped_ptr;
+    
+    class DefsRegistry;
 
 
     /**
@@ -48,8 +53,10 @@ namespace mobject
      * will be created on demand, and any default configuration, once
      * found, will be remembered and stored with the current session.
      */
-    class DefsManager
+    class DefsManager : private boost::noncopyable
       {
+        scoped_ptr<DefsRegistry> defsRegistry;
+        
       protected:
         
         DefsManager ()  throw();
@@ -64,6 +71,7 @@ namespace mobject
         template<class TAR>
         shared_ptr<TAR> operator() (const lumiera::Query<TAR>&);
         
+        
         /** search through the registered defaults, never create anything.
          *  @return object fulfilling the query, \c empty ptr if not found. 
          */
diff --git a/src/proc/mobject/session/defsregistry.cpp b/src/proc/mobject/session/defsregistry.cpp
deleted file mode 100644
index 4eea8df6c..000000000
--- a/src/proc/mobject/session/defsregistry.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  DefsManager  -  implementation of the default object store
- 
-  Copyright (C)         Lumiera.org
-    2008,               Hermann Vosseler <Ichthyostega@web.de>
- 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
-* *****************************************************/
-
-
-#include "proc/mobject/session/defsregistry.hpp"
-#include "common/error.hpp"
-
-//#include <boost/format.hpp>
-
-//using boost::format;
-
-
-
-namespace mobject
-  {
-  namespace session
-    {
-    
-    /** @todo */
-    DefsRegistry::DefsRegistry ()
-    {
-      UNIMPLEMENTED ("initialize store for default objects");
-    }
-    
-
-  } // namespace mobject::session
-
-} // namespace mobject
-
diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defsregistry.hpp
index e6f102738..d52867f42 100644
--- a/src/proc/mobject/session/defsregistry.hpp
+++ b/src/proc/mobject/session/defsregistry.hpp
@@ -25,10 +25,14 @@
 #define MOBJECT_SESSION_DEFSREGISTRY_H
 
 
-#include "common/singleton.hpp"
+#include "common/multithread.hpp"
+#include "common/query.hpp"
+#include "common/util.hpp"
 
+#include <set>
+#include <vector>
 #include <tr1/memory>
-
+#include <boost/utility.hpp>
 
 
 namespace mobject
@@ -36,27 +40,254 @@ namespace mobject
   namespace session
     {
     using std::tr1::shared_ptr;
+    using std::tr1::weak_ptr;
+    using lumiera::Thread;
+    using lumiera::Query;
+    
+    
+    namespace // Implementation details
+      {
+      struct TableEntry 
+        {
+          virtual ~TableEntry() {};
+        };
+      
+      /** we maintain an independent defaults registry
+       *  for every participating kind of objects */
+      typedef std::vector<shared_ptr<TableEntry> > Table;
+      
+      uint maxSlots (0); ///< number of different registered Types
+      
+      
+      /** holding a single "default object" entry */
+      template<class TAR>
+      struct Record
+        {
+          uint degree;
+          Query<TAR> query;
+          weak_ptr<TAR> objRef;
+          
+          Record (const Query<TAR>& q, const shared_ptr<TAR>& obj)
+            : degree (lumiera::query::countPraed (q)),
+              query (q),
+              objRef (obj)
+            { }
 
+          
+          struct Search  ///< Functor searching for a specific object
+            {
+              Search (const shared_ptr<TAR>& obj)
+                : obj_(obj) { }
+
+              const shared_ptr<TAR>& obj_;
+              
+              bool 
+              operator() (const Record& rec)
+              {
+                shared_ptr<TAR> storedObj (rec.objRef.lock());
+                return storedObj && pAsset(storedObj)==pAsset(obj_);               //////////////TODO: not only Assets (i.e. define comparison Operators on Assets!)
+              }
+            };
+          
+          struct OrderRelation
+          {
+            inline bool
+            operator() (Record one, Record two) ///< @note doesn't touch the objRef
+              {
+                return (  one.degree < two.degree
+                       ||(one.degree == two.degree && one.query < two.query)
+                       );
+              }
+          };
+        };
+        
+      /** every new kind of object (Type) creates a new
+       *  slot in the main Table holding all registered 
+       *  default objects. Each slot actually holds a
+       *  separate tree (set) of registry entries
+       */
+      template<class TAR>
+      struct Slot : public TableEntry
+        {
+          typedef typename Record<TAR>::OrderRelation Ordering;
+          typedef std::set<Record<TAR>, Ordering> Registry;
+          
+          Registry registry;
+          static size_t index; ///< where to find this Slot in every Table
+          
+          static Registry&
+          access (Table& table)
+            {
+              if ( !index 
+                 || index > table.size() 
+                 ||!table[index-1])
+                createSlot (table);
+              
+              ASSERT (0 < index && index<=table.size() && table[index-1]);
+              Slot* item = static_cast<Slot*> (table[index-1].get());
+              return item->registry;
+            }
+          
+        private:
+          static void
+          createSlot (Table& table)
+            {
+              Thread::Lock<TableEntry> guard   SIDEEFFECT;
+              if (!index)
+                index = ++maxSlots;
+              if (index > table.size())
+                table.resize (index);
+              table[index-1].reset(new Slot);   
+            }
+        };
+        
+        
+      // static vars to organize one Table Slot per type....
+      template<class TAR>
+      size_t Slot<TAR>::index (0);
+      
+    }
+    
 
     /**
-     * Organize a collection of preconfigured default objects.
-     * For various kinds of objects we can tweek the default parametrisation
-     * as part of the general session configuration. A ref to an instance of
-     * this class is accessible through the current session and can be used
-     * to fill in parts of the configuration of new objects, if the user 
-     * code didn't give more specific parameters. Necessary sub-objects 
-     * will be created on demand, and any default configuration, once
-     * found, will be remembered and stored with the current session.
+     * @internal Helper for organizing preconfigured default objects.
+     * Maintaines a collection of objects known or encountered as "default"
+     * for a given type. This collection is ordered by "degree of constriction",
+     * which is implemented by counting the number of predicates in the query
+     * used to define or identify each object.
+     * Accessing an object identified by a query causes the query to be resolved
+     * (executed in prolog), which may result in some additional properties of
+     * the object being bound or specified.
+     * @todo as of 3/2008 the real query implementation is missing, and the
+     * exact behaviour has to be defined.
      */
-    class DefsRegistry
+    class DefsRegistry : private boost::noncopyable
       {
+        Table table_;
+        
       protected:
         
-        DefsRegistry ();
-        friend class lumiera::singleton::StaticCreate<SessManagerImpl>;
+        DefsRegistry () {};
+        friend class DefsManager;
         
       public:
+        /** used for enumerating solutions */
+        template<class TAR>
+        class Iter          
+          {
+            friend class DefsRegistry;
+            typedef typename Slot<TAR>::Registry::iterator II;
+            
+            II p,i,e;
+            shared_ptr<TAR> next, ptr;
+            
+            Iter (II from, II to) ///< just ennumerates the given range 
+              : p(from), i(from), e(to)
+              {
+                if (i!=e) ++i;  // p is next to be tested, i always one ahead
+                ptr = findNext();
+              }
+            
+            Iter (II match, II from, II to) ///< returns direct match first, then ennumerates 
+              : p(match), i(from), e(to),
+                next(), ptr(findNext())
+              { }
+            
+            shared_ptr<TAR> findNext ()  throw()
+              {
+                while (!next)
+                  {
+                    if (p==e) break;
+                    next = p->objRef.lock();
+                    p = i++;
+                  }
+                return next;
+              }
+            
+          
+          public:
+            shared_ptr<TAR> operator* () { return ptr; }
+            bool hasNext ()              { return next || findNext(); }
+            Iter& operator++ ()           
+              { 
+                ptr=findNext();
+                next.reset();
+                return *this; 
+              }
+          };
         
+        /** find a sequence of "default" objects possibliy matching the query.
+         *  If there was a registration for some object of the given kind with
+         *  the \em same query, this one will be first in the sequence. Besides,
+         *  the sequence will yield all still existing registered "default" objects
+         *  of this kind, ordered ascending by "degree of constriction", i.e. starting
+         *  with the object registered togehter with the shortest query.
+         *  @return a forward input iterator yielding this sequence
+         *  @note none of the queries will be evaluated (we're just counting predicates)
+         */
+        template<class TAR>
+        Iter<TAR> candidates (const Query<TAR>& query)
+          {
+            shared_ptr<TAR> dummy;
+            Record<TAR> entry (query, dummy);
+            typedef typename Slot<TAR>::Registry Registry;
+            Registry& registry = Slot<TAR>::access(table_);
+            
+            // try to get a possible direct match (same query)
+            typename Registry::iterator pos = registry.find (entry);
+            typename Registry::iterator end = registry.end();
+            
+            if (pos==end)
+              return Iter<TAR> (registry.begin(), end);        // just ennumerate contents
+            else
+              return Iter<TAR> (pos, registry.begin(), end); // start with direct match
+          }
+        
+        
+        /** register the object as being "default" when searching something
+         *  similar as designated by the given query. Only a weak ref is stored.
+         *  @param obj Will be rebound, if another object is already stored.
+         *  @return true if object has actually been stored, false if another
+         *          object is registered for exactly the same query. In this
+         *          case, also the param obj shared-ptr is rebound!
+         */
+        template<class TAR>
+        bool put (shared_ptr<TAR>& obj, const Query<TAR>& query)
+          {
+            Record<TAR> entry (query, obj);
+            typedef typename Slot<TAR>::Registry Registry;
+            typedef typename Registry::iterator RIter;
+            
+            Registry& registry = Slot<TAR>::access(table_);
+            RIter pos = registry.lower_bound (entry);
+            if (  pos!=registry.end()
+               && pos->query == query)
+              {
+                shared_ptr<TAR> storedObj (pos->objRef.lock());
+                if (storedObj)
+                  return (pAsset(storedObj) == pAsset(obj));               //////////////TODO: not only Assets (i.e. define comparison Operators on Assets!)
+                else
+                  // use the opportunity and purge the expired entry
+                  registry.erase(pos);
+              }
+            // no existing entry....
+            registry.insert(pos, entry);
+            return true;
+          }
+        
+        
+        /** if this object is registered as "default" in some way, drop the registration.
+         *  @return false if the object wasn't registered at all.
+         */
+        template<class TAR>
+        bool forget (const shared_ptr<TAR>& obj)
+          {
+            typedef typename Slot<TAR>::Registry Registry;
+            typedef typename Record<TAR>::Search SearchFunc;
+            
+            Registry& registry = Slot<TAR>::access(table_);
+            return util::remove_if(registry, SearchFunc (obj));
+          }
       };
 
       
diff --git a/src/proc/mobject/session/session.cpp b/src/proc/mobject/session/session.cpp
index 3544ed4a0..5c4bb8592 100644
--- a/src/proc/mobject/session/session.cpp
+++ b/src/proc/mobject/session/session.cpp
@@ -34,6 +34,7 @@
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/sessionimpl.hpp"
 #include "proc/mobject/session/defsmanager.hpp"
+#include "proc/mobject/session/defsregistry.hpp"
 
 #include "common/singleton.hpp"
 
diff --git a/src/proc/mobject/session/sessmanagerimpl.cpp b/src/proc/mobject/session/sessmanagerimpl.cpp
index 6b5749463..8195e4fbe 100644
--- a/src/proc/mobject/session/sessmanagerimpl.cpp
+++ b/src/proc/mobject/session/sessmanagerimpl.cpp
@@ -39,6 +39,7 @@
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/sessionimpl.hpp"
 #include "proc/mobject/session/defsmanager.hpp"
+#include "proc/mobject/session/defsregistry.hpp"
 #include "common/error.hpp"
 
 using boost::scoped_ptr;
diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
index a4c18f2d9..fff9e6966 100644
--- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
@@ -120,7 +120,8 @@ namespace asset
             
             // issue a ConfigQuery directly, without involving the DefaultsManager
             QueryHandler<Pipe>& typeHandler = ConfigRules::instance();  
-            PPipe pipe1 = typeHandler.resolve (query_for_streamID);
+            PPipe pipe1;
+            typeHandler.resolve (pipe1, query_for_streamID);
             ASSERT (pipe1);
             
             ASSERT (!find (pipe1->getPipeID()));
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 80a57a86b..5f5dbcd9d 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -865,8 +865,8 @@ Taken precisely, the &quot;degree of constriction&quot; yields only a partial or
 As we don't have a Prolog interpreter on board yet, we utilize a mock store with preconfigured answers. (see {{{MockConfigQuery}}}). As this preliminary solution is lacking the ability to create new objects, we need to resort to some trickery here (please look away). The overall logic is quite broken, because the system isn't capable to do any real resolution &amp;mdash; if we ignore this fact, the rest of the algorithm can be implemented, tested and used right now.
 </pre>
 </div>
-<div title="DefaultsManagement" modifier="Ichthyostega" modified="200802200023" created="200801121708" tags="def spec" changecount="11">
-<pre>For several components and properties there is an implicit default value or configuration; it is stored alongside with the session. The intention is that defaults never create an error, instead, they are to be extended silently on demand. Objects configured according to this defaults can be retrieved at the [[Session]] interface by a set of overloaded functions {{{Session::current-&gt;default(Query&lt;TYPE&gt; (&quot;query string&quot;))}}}, where the //query string // defines a capability query similar to what is employed for pipes, stream types, codecs etc. The Queries are implemented by [[configuration rules|ConfigRules]]
+<div title="DefaultsManagement" modifier="Ichthyostega" modified="200803212244" created="200801121708" tags="def spec" changecount="12">
+<pre>For several components and properties there is an implicit default value or configuration; it is stored alongside with the session. The intention is that defaults never create an error, instead, they are to be extended silently on demand. Objects configured according to this defaults can be retrieved at the [[Session]] interface by a set of overloaded functions {{{Session::current-&gt;default(Query&lt;TYPE&gt; (&quot;query string&quot;))}}}, where the //query string // defines a capability query similar to what is employed for pipes, stream types, codecs etc. This query mechanism is implemented by [[configuration rules|ConfigRules]]
 
 !!!!what is denoted by {{{default}}}?
 {{{default(Obj)}}} is a predicate expressing that the object {{{Obj}}} can be considered the default setup under the given conditions. Using the //default// can be considered as a shortcut for actually finding a exact and unique solution. The latter would require to specify all sorts of detailed properties up to the point where only one single object can satisfy all conditions. On the other hand, leaving some properties unspecified would yield a set of solutions (and the user code issuing the query had to provide means for selecting one soltution from this set). Just falling back on the //default// means that the user code actually doesn't care for any additional properties (as long as the properties he //does// care for are satisfied). Nothing is said specifically on //how//&amp;nbsp; this default gets configured; actually there can be rules //somewhere,// and, additionally, anything encountered once while asking for a default can be re-used as default under similar circumstances.

From e9a364f7adb516ec906a4238bf558e2acef6de73 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Tue, 1 Apr 2008 06:57:00 +0200
Subject: [PATCH 13/36] WIP test covering implementation of the default object
 registry (doesn't yet compile)

---
 tests/components/common/typelistutiltest.cpp  |   4 +-
 .../mobject/session/defsmanagerimpltest.cpp   |   8 +-
 .../proc/mobject/session/defsmanagertest.cpp  |   2 +-
 .../mobject/session/defsregistryimpltest.cpp  | 308 ++++++++++++++++++
 wiki/renderengine.html                        |   4 +-
 5 files changed, 319 insertions(+), 7 deletions(-)
 create mode 100644 tests/components/proc/mobject/session/defsregistryimpltest.cpp

diff --git a/tests/components/common/typelistutiltest.cpp b/tests/components/common/typelistutiltest.cpp
index d0e2f683f..73cab939e 100644
--- a/tests/components/common/typelistutiltest.cpp
+++ b/tests/components/common/typelistutiltest.cpp
@@ -56,8 +56,8 @@ namespace lumiera
       
       /** template for generating lots of different test types */
       template<int I>
-      struct Block    
-        { 
+      struct Block
+        {
           static string name;
           string talk()   { return name+"::eat(..)"; }  
         };
diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
index fff9e6966..ff94f8a85 100644
--- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
@@ -106,10 +106,14 @@ namespace asset
             
             // now declare that these objects should be considered "default"
             ASSERT (Session::current->defaults.define (pipe1, Query<Pipe> (""))); // unrestricted default
-            ASSERT (Session::current->defaults.define (pipe1, Query<Pipe> ("stream("+sID+")")));
+            ASSERT (Session::current->defaults.define (pipe2, Query<Pipe> ("stream("+sID+")")));
             
             ASSERT ( find (pipe1->getPipeID()), "failure declaring object as default");
             ASSERT ( find (pipe2->getPipeID()), "failure declaring object as default");
+            
+            ASSERT (sID != pipe1->getProcPatt()->queryStreamID(), "accidental clash");
+            ASSERT (!Session::current->defaults.define (pipe1, Query<Pipe> ("stream("+sID+")")));
+                    // can't be registered with this query, due to failure caused by wrong stream-ID
           }
         
         
@@ -143,7 +147,7 @@ namespace asset
             // now de-register the pipe as "default Pipe"
             ASSERT (Session::current->defaults.forget (pipe));
             ASSERT (!find (pipe->getPipeID()));
-            ASSERT (cnt == pipe.use_count());   // indicates that DefaultsManager only holds a weak ref.
+            ASSERT (cnt == pipe.use_count());   // indicates DefaultsManager holding only a weak ref.
           }
       };
     
diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp
index b1c768836..1e66a0553 100644
--- a/tests/components/proc/mobject/session/defsmanagertest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagertest.cpp
@@ -152,7 +152,7 @@ namespace asset
                 PPipe pipe1 = Session::current->defaults (query_for_pID);
                 hash = pipe1->getID();
               }
-             // now AssetManager should have the only ref
+             // now AssetManager should hold the only ref
             ID<Asset> assetID (hash);
               
             AssetManager& aMang (AssetManager::instance());
diff --git a/tests/components/proc/mobject/session/defsregistryimpltest.cpp b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
new file mode 100644
index 000000000..49c2fb343
--- /dev/null
+++ b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
@@ -0,0 +1,308 @@
+/*
+  DefsRegistryImpl(Test)  -  verifying correct behaviour of the defaults registry
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "common/test/run.hpp"
+#include "common/util.hpp"
+
+#include "proc/mobject/session/defsregistry.hpp"
+#include "common/factory.hpp"
+#include "common/query.hpp"
+
+#include <boost/scoped_ptr.hpp>
+#include <boost/format.hpp>
+#include <cstdlib>
+#include <map>
+
+using lumiera::Query;
+
+using std::tr1::shared_ptr;
+using boost::scoped_ptr;
+using boost::format;
+using util::isnil;
+using std::string;
+using std::rand;
+using std::map;
+
+
+namespace mobject
+  {
+  namespace session
+    {
+    namespace test
+      {
+      
+      const uint MAX_DEGREE_RAND = 9;
+      
+      format typePatt ("Dummy<%2i>");
+      format instancePatt ("obj_%s_%i");
+      format predicatePatt ("%s_%2i( %s )");
+      
+      const string garbage ("asdfghjklqwertzuiop");
+      
+      
+      /** create a random new ID */
+      string 
+      newID (Symbol prefix)
+      {
+        return str (instancePatt % prefix % rand());
+      }
+      
+      
+      /** template for generating some different test types */
+      template<int I>
+      struct Dummy
+        {
+          static string name;
+          string instanceID;
+          
+          Dummy () : instanceID (newID (name)) {}
+        };
+        
+      template<int I>
+      string Dummy<I>::name = str (typePatt % I);
+      
+      
+      
+      /** fabricating (random) query strings */
+      string
+      q_str (int degree=0)
+      {
+        string fake;
+        if (!degree) 
+          degree = 1 + rand() % MAX_DEGREE_RAND;
+        while (0 < --degree)
+          fake += garbage_term() + ", ";
+        fake += garbage_term() + ".";
+        return fake;
+      }
+      
+      string
+      garbage_term ()
+      {
+        return (predicatePatt 
+               % char ('a'+ rand() % 26)
+               % rand() % 100
+               % garbage.substr(rand() % 17 , 3)
+               );
+      }
+      
+      
+      /************************************************************************
+       * @test build an registry table (just for this test) configured for
+       *       some artificial test Types. Register some entries and verify
+       *       the intended behaviour of the storage structure.
+       * @see  DefsManagerImpl_test for checking the implementation details
+       *       in the actual context used in Lumiera.
+       */
+      class DefsRegistryImpl_test : public Test
+        {
+          scoped_ptr<DefsRegistry> reg_;
+          
+          typedef shared_ptr<Dummy<13> > O;
+          typedef shared_ptr<Dummy<23> > P;
+          
+          typedef Query<Dummy<13> > Q13;
+          typedef Query<Dummy<23> > Q23;
+
+          // fabricating Objects wrapped into smart-ptrs
+          lumiera::factory::RefcountPtr<O> oFac;
+          lumiera::factory::RefcountPtr<P> pFac;
+          
+          O o1, o2, o3;
+          Q13 q1, q2, q3, q4, q5;
+          map<Q23, P> ps;
+          
+          DefsRegistryImpl_test ()
+            : o1 (oFac()), o2 (oFac()), o3 (oFac()), 
+              q1 (q_str (1)),
+              q2 (q_str (2)),
+              q3 (q_str (3)),
+              q4 (q_str (4)),
+              q5 (q_str (5))
+            { }
+          
+          
+          virtual void run(Arg arg) 
+            {
+              this->reg_.reset (new DefsRegistry);
+              
+              fill_table ();
+              check_query ();
+              check_remove ();
+            }
+          
+          
+          
+          
+          void fill_table ()
+            {
+               // at start the registry is indeed empty
+              //  thus a query doesnt yield any results....
+              ASSERT ( ! *(reg_->candidates(Q13 ("something"))) );
+              
+              reg_->put (o1, q5);
+              reg_->put (o2, q4);
+              reg_->put (o3, q3);
+              reg_->put (o3, q2);
+              reg_->put (o2, q1);
+              reg_->put (o1, Q13); // the empty query
+             
+              ps.clear();
+              for (int i=0; i<100; ++i)
+                {
+                  P px (pFac());
+                  Q23 qx (q_str());
+                  ps[qx] = px;
+                  reg_->put (px, qx);
+                  px.instanceID = qx;
+                }
+            }
+          
+          
+          void check_query ()
+            {
+              DefsRegistry::Iter<Dummy<13> > i;
+              i = reg_->candidates(Q13 ("irrelevant query"));
+              ASSERT ( i.hasNext());
+              ASSERT ( *i++ == o1);  // ordered according to the degree of the queries
+              ASSERT ( *i++ == o2);
+              ASSERT ( *i++ == o3);
+              ASSERT ( *i++ == o3);
+              ASSERT ( *i++ == o2);
+              ASSERT ( *i   == o1);
+              ASSERT (!i.hasNext());
+              
+              i = reg_->candidates(q3);
+              ASSERT ( *i++ == o3);  // found by direct match
+              ASSERT ( *i++ == o1);  // followed by the ordered ennumeration
+              ASSERT ( *i++ == o2);
+              ASSERT ( *i++ == o3);
+              ASSERT ( *i++ == o3);
+              ASSERT ( *i++ == o2);
+              ASSERT ( *i++ == o1);
+              ASSERT (!i.hasNext());
+              
+              i = reg_->candidates(Q13);
+              ASSERT ( *i++ == o1);  // found by direct match to the empty query
+              ASSERT ( *i++ == o1);
+              ASSERT ( *i++ == o2);
+              ASSERT ( *i++ == o3);
+              ASSERT ( *i++ == o3);
+              ASSERT ( *i++ == o2);
+              ASSERT ( *i++ == o1);
+              ASSERT (!i.hasNext());
+              
+              uint d=0;
+              uint d_prev=0;
+              for (i = reg_->candidates(Q23 ("some crap")); 
+                   i.hasNext(); ++i )
+                {
+                  ASSERT ( *i );
+                  Q23 qx = (*i)->instanceID;
+                  ASSERT ( ps[qx] == (*i));
+                  d = lumiera::query::countPraed (qx);
+                  ASSERT ( d_prev <= d );
+                  d_prev = d;
+                }
+              ASSERT (!i.hasNext());
+              
+              // calling with an arbitrary (registered) query
+              // yields the corresponding object at start of the ennumeration
+              i = reg_->candidates(ps.begin()->first);
+              ASSERT ( *i == ps.begin()->second);
+              
+            }
+          
+          
+          void check_remove ()
+            {
+              reg_->forget (o2);
+              
+              DefsRegistry::Iter<Dummy<13> > i;
+              i = reg_->candidates(q4);
+              ASSERT ( i.hasNext());
+              ASSERT ( *i++ == o1);  // ordered according to the degree of the queries
+                                     // but the o2 entries are missing
+              ASSERT ( *i++ == o3);
+              ASSERT ( *i++ == o3);
+                                     // missing
+              ASSERT ( *i   == o1);
+              ASSERT (!i.hasNext());
+              
+              o3.reset(); // killing the only reference....
+                         //  expires the weak ref in the registry
+
+              i = reg_->candidates(Q13 ("something"));
+              ASSERT ( i.hasNext());
+              ASSERT ( *i++ == o1);  // ordered according to the degree of the queries
+                                     // but now also the o3 entries are missing...
+              ASSERT ( *i   == o1);
+              ASSERT (!i.hasNext());
+              
+              ASSERT ( reg_->put (o1, q5));  // trying to register the same object at the same place
+                                             // doesn't change anything (but counts as "success")
+              i = reg_->candidates(q5);
+              ASSERT ( *i++ == o1); // direct match
+              ASSERT ( *i++ == o1);
+              ASSERT ( *i++ == o1);
+              ASSERT (!i.hasNext());
+              
+              ASSERT ( reg_->put (o2, q5));  // trying to (re)register o2 with a existing query
+                                             // counts as failure (nothing chages)
+              i = reg_->candidates(q5);
+              ASSERT ( *i++ == o1); // direct match
+              ASSERT ( *i++ == o1);
+              ASSERT ( *i++ == o1);
+              ASSERT (!i.hasNext());
+              
+              ASSERT ( reg_->put (o2, q2));  // trying to (re)register o2 with another query succeeds
+              i = reg_->candidates(q2);
+              ASSERT ( *i++ == o2); // direct match
+              ASSERT ( *i++ == o1);
+              ASSERT ( *i++ == o2); // inserted here in the dataset
+              ASSERT ( *i++ == o1);
+              ASSERT (!i.hasNext());
+              
+              ASSERT ( reg_->forget (o1));
+              ASSERT ( reg_->forget (o1)); // failure, because it's already removed
+              ASSERT (!reg_->forget (o2)); 
+
+              o3.reset (oFac());  // another object is another object (it's irrelevant...) 
+              
+              i = reg_->candidates(q2);
+              ASSERT (! (*i)); // empty
+            }
+          
+        };
+      
+      
+      /** Register this test class... */
+      LAUNCHER (DefsRegistryImpl_test, "function session");
+      
+      
+      
+    } // namespace test
+    
+  } // namespace mobject
+
+} // namespace mobject
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 5f5dbcd9d..5523b8c60 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -842,7 +842,7 @@ This is an very important external Interface, because it links together all thre
 <pre>[[ProcLayer and Engine]]
 </pre>
 </div>
-<div title="DefaultsImplementation" modifier="Ichthyostega" modified="200802290000" created="200802200043" tags="spec impl draft" changecount="10">
+<div title="DefaultsImplementation" modifier="Ichthyostega" modified="200804010137" created="200802200043" tags="spec impl draft" changecount="11">
 <pre>As detailed in the [[definition|DefaultsManagement]], {{{default(Obj)}}} is sort of a Joker along the lines &quot;give me a suitable Object and I don't care for further details&quot;. Actually, default objects are implemented by the {{{mobject::session::DefsManager}}}, which remembers and keeps track of anything labeled as &quot;default&quot;. This defaults manager is a singleton and can be accessed via the [[Session]] interface, meaning that the memory track regarding defaults is part of the session state. Accessing an object via the query for an default actually //tagges// this object (storing a weak ref in the ~DefsManager). Alongside with each object successfully queried via &quot;default&quot;, the degree of constriction is remembered, i.e. the number of additional conditions contained in the query. This enables us to search for default objects starting with the most unspecific.
 
 !Skeleton
@@ -858,7 +858,7 @@ This is an very important external Interface, because it links together all thre
 #** otherwise, the newly created object is remembered (tagged) as new default, together with the degree of constriction
 
 !!!Implementation details
-Taken precisely, the &quot;degree of constriction&quot; yields only a partial ordering &amp;mdash; but as the &quot;default&quot;-predicate is sort of a existential quantification anyways, its sole purpose is to avoid polluting the session with unnecessary default objects, and we don't need to care for absolute precision. A suitable approximation is to count the number of predicates terms in the query and use a pqueue (separate for each Type) to store weak refs to the the objects tagged as &quot;default&quot;
+Taken precisely, the &quot;degree of constriction&quot; yields only a partial ordering &amp;mdash; but as the &quot;default&quot;-predicate is sort of a existential quantification anyways, its sole purpose is to avoid polluting the session with unnecessary default objects, and we don't need to care for absolute precision. A suitable approximation is to count the number of predicates terms in the query and use a (sorted) set (separate for each Type) to store weak refs to the the objects tagged as &quot;default&quot;
 {{red{WARN}}} there is an interference with the (planned) Undo function. This is a general problem of the config queries; just ignoring this issue seems reasonable.
 
 !!!Problems with the (preliminary) mock implementation

From 3d2791b91eafebd495d307d47e03b520db5f1215 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Wed, 2 Apr 2008 04:06:08 +0200
Subject: [PATCH 14/36] WIP some fixes; add test for a utility function

---
 src/proc/mobject/session/defsregistry.hpp     |   6 +-
 tests/components/common/removefromsettest.cpp | 108 ++++++++++++++++++
 .../mobject/session/defsregistryimpltest.cpp  |  69 +++++------
 3 files changed, 146 insertions(+), 37 deletions(-)
 create mode 100644 tests/components/common/removefromsettest.cpp

diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defsregistry.hpp
index d52867f42..5a2328867 100644
--- a/src/proc/mobject/session/defsregistry.hpp
+++ b/src/proc/mobject/session/defsregistry.hpp
@@ -165,11 +165,6 @@ namespace mobject
       {
         Table table_;
         
-      protected:
-        
-        DefsRegistry () {};
-        friend class DefsManager;
-        
       public:
         /** used for enumerating solutions */
         template<class TAR>
@@ -208,6 +203,7 @@ namespace mobject
           public:
             shared_ptr<TAR> operator* () { return ptr; }
             bool hasNext ()              { return next || findNext(); }
+            Iter  operator++ (int)       { Iter tmp=*this; operator++(); return tmp; }            
             Iter& operator++ ()           
               { 
                 ptr=findNext();
diff --git a/tests/components/common/removefromsettest.cpp b/tests/components/common/removefromsettest.cpp
new file mode 100644
index 000000000..bf1629378
--- /dev/null
+++ b/tests/components/common/removefromsettest.cpp
@@ -0,0 +1,108 @@
+/*
+  RemoveFromSet(Test)  -  algorithm removing predicated elements from set
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "common/test/run.hpp"
+#include "common/util.hpp"
+
+#include <boost/lexical_cast.hpp>
+#include <boost/lambda/lambda.hpp>
+//#include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <iostream>
+#include <string>
+#include <set>
+
+using std::cout;
+using std::string;
+
+
+
+namespace util
+  {
+  namespace test
+    {
+    using util::for_each;
+    using boost::lambda::_1;
+//    using boost::function;
+    using boost::lexical_cast;
+    using boost::bind;
+    
+  
+    template<class COLL>
+    void 
+    show (COLL const& coll)
+    {
+      cout << "[ ";
+      for_each (coll, cout << _1 << ", ");
+      cout << "]\n";
+    }
+    
+    
+    bool
+    killerselector (string description, uint candidate)
+    {
+      return string::npos != description.find( lexical_cast<string> (candidate));
+    }
+    
+    
+    
+    class RemoveFromSet_test : public Test
+      {
+        virtual void run (Arg arg)
+          {
+            test_remove (" nothing ");
+            test_remove ("0");
+            test_remove ("9");
+            test_remove ("5");
+            test_remove ("0 2 4 6 8");
+            test_remove ("1 3 5 7 9");
+            test_remove ("0 1 2 3 4 5 6 7 8 9");
+            test_remove ("0 1 2 3 4 5 6 7 8  ");
+            test_remove ("  1 2 3 4 5 6 7 8 9");
+            test_remove ("0 1 2 3 4   6 7 8 9");
+          }
+        
+        /** @test populate a test set, remove the denoted elements
+         *        and print the result
+         */
+        test_remove (string elems_to_remove)
+          {
+            std::set<uint> theSet;
+            for (int i=0; i<10; ++i)
+              theSet.push_back (i);
+            
+            util::remove_if (theSet, bind( killerselector, elems_to_remove, _1));
+            
+            show (theSet);
+          }
+        
+      };
+    
+      
+      LAUNCHER (RemoveFromSet_test, "unit common");
+
+      
+  } // namespace test
+    
+} // namespace util
+
diff --git a/tests/components/proc/mobject/session/defsregistryimpltest.cpp b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
index 49c2fb343..6a01f15c0 100644
--- a/tests/components/proc/mobject/session/defsregistryimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
@@ -34,16 +34,17 @@
 #include <map>
 
 using lumiera::Query;
+using util::isnil;
 
 using std::tr1::shared_ptr;
 using boost::scoped_ptr;
 using boost::format;
-using util::isnil;
 using std::string;
 using std::rand;
 using std::map;
 
 
+
 namespace mobject
   {
   namespace session
@@ -62,7 +63,7 @@ namespace mobject
       
       /** create a random new ID */
       string 
-      newID (Symbol prefix)
+      newID (string prefix)
       {
         return str (instancePatt % prefix % rand());
       }
@@ -83,9 +84,19 @@ namespace mobject
       
       
       
-      /** fabricating (random) query strings */
       string
-      q_str (int degree=0)
+      garbage_term ()         ///< yields a random string of 3 letters
+      {
+        return str (predicatePatt 
+                   % char ('a'+ rand() % 26)
+                   % rand() % 100
+                   % garbage.substr(rand() % 17 , 3)
+                   );
+      }
+      
+      string
+      q_str (int degree=0)    ///< fabricating (random) query strings
+
       {
         string fake;
         if (!degree) 
@@ -96,15 +107,6 @@ namespace mobject
         return fake;
       }
       
-      string
-      garbage_term ()
-      {
-        return (predicatePatt 
-               % char ('a'+ rand() % 26)
-               % rand() % 100
-               % garbage.substr(rand() % 17 , 3)
-               );
-      }
       
       
       /************************************************************************
@@ -123,15 +125,20 @@ namespace mobject
           
           typedef Query<Dummy<13> > Q13;
           typedef Query<Dummy<23> > Q23;
-
+          
+          typedef DefsRegistry::Iter<Dummy<13> > Iter13;
+          typedef DefsRegistry::Iter<Dummy<23> > Iter23;
+          
+          
           // fabricating Objects wrapped into smart-ptrs
-          lumiera::factory::RefcountPtr<O> oFac;
-          lumiera::factory::RefcountPtr<P> pFac;
+          lumiera::factory::RefcountPtr<Dummy<13> > oFac;
+          lumiera::factory::RefcountPtr<Dummy<23> > pFac;
           
           O o1, o2, o3;
           Q13 q1, q2, q3, q4, q5;
           map<Q23, P> ps;
           
+        public:
           DefsRegistryImpl_test ()
             : o1 (oFac()), o2 (oFac()), o3 (oFac()), 
               q1 (q_str (1)),
@@ -165,7 +172,7 @@ namespace mobject
               reg_->put (o3, q3);
               reg_->put (o3, q2);
               reg_->put (o2, q1);
-              reg_->put (o1, Q13); // the empty query
+              reg_->put (o1, Q13()); // the empty query
              
               ps.clear();
               for (int i=0; i<100; ++i)
@@ -174,15 +181,14 @@ namespace mobject
                   Q23 qx (q_str());
                   ps[qx] = px;
                   reg_->put (px, qx);
-                  px.instanceID = qx;
+                  px->instanceID = qx;
                 }
             }
           
           
           void check_query ()
             {
-              DefsRegistry::Iter<Dummy<13> > i;
-              i = reg_->candidates(Q13 ("irrelevant query"));
+              Iter13 i (reg_->candidates(Q13 ("irrelevant query")));
               ASSERT ( i.hasNext());
               ASSERT ( *i++ == o1);  // ordered according to the degree of the queries
               ASSERT ( *i++ == o2);
@@ -202,7 +208,7 @@ namespace mobject
               ASSERT ( *i++ == o1);
               ASSERT (!i.hasNext());
               
-              i = reg_->candidates(Q13);
+              i = reg_->candidates(Q13());
               ASSERT ( *i++ == o1);  // found by direct match to the empty query
               ASSERT ( *i++ == o1);
               ASSERT ( *i++ == o2);
@@ -214,22 +220,22 @@ namespace mobject
               
               uint d=0;
               uint d_prev=0;
-              for (i = reg_->candidates(Q23 ("some crap")); 
-                   i.hasNext(); ++i )
+              Iter23 j = reg_->candidates(Q23 ("some crap"));
+              for ( ; j.hasNext(); ++j )
                 {
-                  ASSERT ( *i );
-                  Q23 qx = (*i)->instanceID;
-                  ASSERT ( ps[qx] == (*i));
+                  ASSERT ( *j );
+                  Q23 qx ((*j)->instanceID);
+                  ASSERT ( ps[qx] == (*j));
                   d = lumiera::query::countPraed (qx);
                   ASSERT ( d_prev <= d );
                   d_prev = d;
                 }
-              ASSERT (!i.hasNext());
+              ASSERT (!j.hasNext());
               
               // calling with an arbitrary (registered) query
               // yields the corresponding object at start of the ennumeration
-              i = reg_->candidates(ps.begin()->first);
-              ASSERT ( *i == ps.begin()->second);
+              j = reg_->candidates(ps.begin()->first);
+              ASSERT ( *j == ps.begin()->second);
               
             }
           
@@ -238,8 +244,7 @@ namespace mobject
             {
               reg_->forget (o2);
               
-              DefsRegistry::Iter<Dummy<13> > i;
-              i = reg_->candidates(q4);
+              Iter13 i (reg_->candidates(q4));
               ASSERT ( i.hasNext());
               ASSERT ( *i++ == o1);  // ordered according to the degree of the queries
                                      // but the o2 entries are missing
@@ -287,7 +292,7 @@ namespace mobject
               ASSERT ( reg_->forget (o1)); // failure, because it's already removed
               ASSERT (!reg_->forget (o2)); 
 
-              o3.reset (oFac());  // another object is another object (it's irrelevant...) 
+              o3 = oFac();        // another object is another object (it's irrelevant...) 
               
               i = reg_->candidates(q2);
               ASSERT (! (*i)); // empty

From 162976a4cf84443436ee224690e254b1a8616fff Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Thu, 3 Apr 2008 03:50:28 +0200
Subject: [PATCH 15/36] WIP reorganize the ordering relation on assets (should
 simplify handling of comparisons at various places)

---
 src/proc/asset.hpp                            | 95 +++++++++++--------
 tests/components/common/removefromsettest.cpp | 26 ++---
 2 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp
index bc587cc96..b9a85e5ae 100644
--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@@ -39,7 +39,7 @@
  ** value. For example the asset::Media#getID returns an ID<Media>. By using the
  ** templated query function AssetManager#getAsset, we can get at references to the more 
  ** specific subinterface asset::media just by using the ID value in a typesafe manner.
- ** This helps avoiding dynamic typing and switch-on-type, leading to much more robust,
+ ** This helps avoiding dynamic typing and switch-on-type, leading to more robust,
  ** extensible and clear code.
  **
  ** (Implementation detail: as g++ is not able to handle member function template
@@ -65,6 +65,7 @@
 #include <vector>
 #include <set>
 #include <tr1/memory>
+#include <boost/operators.hpp>
 #include <boost/utility.hpp>
 
 
@@ -128,12 +129,14 @@ namespace asset
    * asset::Effect, asset::Codec, asset::Track, asset::Dataset.
    * @note Assets objects have a strict unique identity and because of this are non-copyable.
    *       You can not create an Asset derived object without registering it with the AssetManager
-   *       automatically. I is possible to copy the PAsset (smart pointer) though. 
+   *       automatically. It is possible to copy the PAsset (smart pointer) though. 
    * 
    * @since 09/2007
    * @author Ichthyo
    */
-  class Asset : private boost::noncopyable
+  class Asset 
+    : boost::totally_ordered< Asset,
+        boost::noncopyable>
     {
     public:
 
@@ -142,6 +145,7 @@ namespace asset
        *  sufficiently identifying any given Asset. 
        */
       struct Ident
+        : boost::totally_ordered<Ident>
         {
           /** element ID, comprehensible but sanitized.
            *  The tuple (category, name, org) is unique.
@@ -174,20 +178,13 @@ namespace asset
                  const string& o = "lumi", 
                  const uint ver=1);
           
+          
+          int compare (const Ident& other)   const;
+
           /** @note equality ignores version differences */
-          bool operator== (const Ident& other)  const
-            {
-              return org == other.org
-                  && name == other.name 
-                  && category == other.category;
-            }
-          bool operator!= (const Ident& other)  const
-            {
-              return !operator==(other);
-            }
-          
-          int compare (const Ident& other)  const;
-          
+          bool operator== (const Ident& oi)  const { return compare (oi) ==0; }
+          bool operator<  (const Ident& oi)  const { return compare (oi) < 0; }
+    
           operator string ()  const;
         };
       
@@ -197,11 +194,16 @@ namespace asset
     public:    
       const Ident ident;     ///<  Asset identification tuple
 
-      virtual const ID<Asset>& getID()  const { return id; }
-
+      virtual const ID<Asset>& getID()   const { return id; }
+      
+      
+      bool operator== (const Asset& oa)  const { return ident == oa.ident; }
+      bool operator<  (const Asset& oa)  const { return ident <  oa.ident; }
+          
       virtual operator string ()  const;
       
       
+      
     protected:
       const ID<Asset> id;   ///<   Asset primary key.
 
@@ -293,6 +295,20 @@ namespace asset
     
     
     
+    /* ====== ordering of Assets and Asset-Pointers ====== */
+    
+    /** ordering of Assets is based on the ordering
+     *  of Ident tuples, which are supposed to be unique.
+     *  @note version info is irrelevant */
+    inline int 
+    Asset::Ident::compare (const Asset::Ident& oi)  const
+    { 
+      int res;
+      if (0 != (res=category.compare (oi.category)))  return res;
+      if (0 != (res=org.compare (oi.org)))            return res;
+      return name.compare (oi.name);
+    }
+    
     /** promote subtype-ptr to PAsset, e.g. for comparing */
     template<class A>
     inline const PcAsset
@@ -304,30 +320,27 @@ namespace asset
     /** ordering of Asset smart ptrs based on Ident tuple.
      *  @todo currently supporting only smart_ptr<Asset>.
      *  @todo should better be done using boost::operator */
-    inline bool operator== (const PcAsset& a1, const PcAsset& a2) { return a1 && a2 && ( 0==a1->ident.compare(a2->ident));}
-    inline bool operator<  (const PcAsset& a1, const PcAsset& a2) { return a1 && a2 && (-1==a1->ident.compare(a2->ident));}
-    inline bool operator>  (const PcAsset& a1, const PcAsset& a2) { return   a2 < a1;  }
-    inline bool operator>= (const PcAsset& a1, const PcAsset& a2) { return !(a1 < a2); }
-    inline bool operator<= (const PcAsset& a1, const PcAsset& a2) { return !(a1 > a2); }
-    inline bool operator!= (const PcAsset& a1, const PcAsset& a2) { return !(a1== a2); }
+    inline bool operator== (PcAsset const& a1, PcAsset const& a2) { return a1 && a2 && ( (*a1) == (*a2));}
+    inline bool operator<  (PcAsset const& a1, PcAsset const& a2) { return a1 && a2 && ( (*a1) <  (*a2));}
 
-    inline bool operator== (const PAsset& a1,  const PAsset& a2)  { return pAsset(a1) == pAsset(a2); }
-    inline bool operator<  (const PAsset& a1,  const PAsset& a2)  { return pAsset(a1) <  pAsset(a2); }
-    inline bool operator>  (const PAsset& a1,  const PAsset& a2)  { return pAsset(a1) >  pAsset(a2); }
-    inline bool operator>= (const PAsset& a1,  const PAsset& a2)  { return pAsset(a1) >= pAsset(a2); }
-    inline bool operator<= (const PAsset& a1,  const PAsset& a2)  { return pAsset(a1) <= pAsset(a2); }
-    inline bool operator!= (const PAsset& a1,  const PAsset& a2)  { return pAsset(a1) != pAsset(a2); }
-
-    /** ordering of Asset Ident tuples.
-     *  @note version is irrelevant */
-    inline int 
-    Asset::Ident::compare (const Asset::Ident& oi)  const
-    { 
-      int res;
-      if (0 != (res=category.compare (oi.category)))  return res;
-      if (0 != (res=org.compare (oi.org)))            return res;
-      return name.compare (oi.name);
-    }
+    template<class PA1, class PA2>
+    inline bool operator== (PA1 const& a1, PA2 const& a2)  { return pAsset(a1) == pAsset(a2); }
+    
+    template<class PA1, class PA2>
+    inline bool operator<  (PA1 const& a1, PA2 const& a2)  { return pAsset(a1) <  pAsset(a2); }
+    
+    
+    /** build ordering of Asset shared pointers on the ordering of the pointed to assets.
+     *  Because we can't define member operators for shared-ptrs, we explicitly instantiate
+     *  the boost ordering concept template for all Asset kinds we want to use...
+     */
+    template<class PTR>
+    struct asset_total_ordering : public boost::totally_ordered<PTR> 
+    { };
+    
+    template struct asset_total_ordering<PAsset>;
+    template struct asset_total_ordering<PcAsset>;
+    
     
     
     /** convienient for debugging */
diff --git a/tests/components/common/removefromsettest.cpp b/tests/components/common/removefromsettest.cpp
index bf1629378..c51d02019 100644
--- a/tests/components/common/removefromsettest.cpp
+++ b/tests/components/common/removefromsettest.cpp
@@ -26,8 +26,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/lambda/lambda.hpp>
-//#include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/lambda/bind.hpp>
 #include <iostream>
 #include <string>
 #include <set>
@@ -43,9 +42,9 @@ namespace util
     {
     using util::for_each;
     using boost::lambda::_1;
-//    using boost::function;
+    using boost::lambda::bind;
     using boost::lexical_cast;
-    using boost::bind;
+    
     
   
     template<class COLL>
@@ -57,7 +56,6 @@ namespace util
       cout << "]\n";
     }
     
-    
     bool
     killerselector (string description, uint candidate)
     {
@@ -68,31 +66,35 @@ namespace util
     
     class RemoveFromSet_test : public Test
       {
-        virtual void run (Arg arg)
+        virtual void
+        run (Arg arg)
           {
             test_remove (" nothing ");
             test_remove ("0");
             test_remove ("9");
             test_remove ("5");
-            test_remove ("0 2 4 6 8");
-            test_remove ("1 3 5 7 9");
+            test_remove ("0   2   4   6   8  ");
+            test_remove ("  1   3   5   7   9");
             test_remove ("0 1 2 3 4 5 6 7 8 9");
             test_remove ("0 1 2 3 4 5 6 7 8  ");
             test_remove ("  1 2 3 4 5 6 7 8 9");
             test_remove ("0 1 2 3 4   6 7 8 9");
           }
         
-        /** @test populate a test set, remove the denoted elements
-         *        and print the result
-         */
+        
+        /** @test populate a test set,
+         *        remove the denoted elements
+         *        and print the result...  */
+        void
         test_remove (string elems_to_remove)
           {
             std::set<uint> theSet;
             for (int i=0; i<10; ++i)
-              theSet.push_back (i);
+              theSet.insert (i);
             
             util::remove_if (theSet, bind( killerselector, elems_to_remove, _1));
             
+            cout << "removed " << elems_to_remove << " ---> ";
             show (theSet);
           }
         

From 89e71212e17cb65f1984127c502e9c1e0ee1e0b9 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 5 Apr 2008 05:45:21 +0200
Subject: [PATCH 16/36] include the tools subdir in default target (=build)

---
 SConstruct | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 4d2f2ee9c..6b6350210 100644
--- a/SConstruct
+++ b/SConstruct
@@ -251,7 +251,7 @@ def defineBuildTargets(env, artifacts):
     artifacts['plugins'] = env.SharedLibrary('$BINDIR/lumiera-plugin', plugobj)
     
     # call subdir SConscript(s) for independent components
-    SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts')
+    SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts core')
     SConscript(dirs=[TESTDIR], exports='env artifacts core')
 
 
@@ -264,7 +264,7 @@ def definePostBuildTargets(env, artifacts):
     il = env.Alias('install-lib', '$DESTDIR/lib')
     env.Alias('install', [ib, il])
     
-    build = env.Alias('build', artifacts['lumiera']+artifacts['plugins'])
+    build = env.Alias('build', artifacts['lumiera']+artifacts['plugins']+artifacts['tools'])
     allbu = env.Alias('allbuild', build+artifacts['testsuite'])
     env.Default('build')
     # additional files to be cleaned when cleaning 'build'

From 2b529e3fac22a0d5da2a4df72c4005ee90b98fb7 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 5 Apr 2008 05:57:54 +0200
Subject: [PATCH 17/36] customized smart-ptr based on std::shared_ptr hopefully
 resolves long standing problems with odering and type relations of objects
 handled via smart ptr

---
 src/common/p.hpp                              | 128 +++++++
 src/tool/SConscript                           |   4 +-
 src/tool/try.cpp                              |  84 ++++-
 tests/50components.tests                      |  20 +-
 .../components/common/customsharedptrtest.cpp | 315 ++++++++++++++++++
 5 files changed, 541 insertions(+), 10 deletions(-)
 create mode 100644 src/common/p.hpp
 create mode 100644 tests/components/common/customsharedptrtest.cpp

diff --git a/src/common/p.hpp b/src/common/p.hpp
new file mode 100644
index 000000000..d4cc2f11c
--- /dev/null
+++ b/src/common/p.hpp
@@ -0,0 +1,128 @@
+/*
+  P.hpp  -  customized shared_ptr with ordering and type relationships
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+*/
+
+/** @file p.hpp
+ ** customized refcounting smart pointer.
+ ** Template derived from std::tr1::shared_ptr adding total ordering and 
+ ** type relationships implemented by forwarding to the pointees. In all other
+ ** respects, it should behave exactly as shared_ptr and is able to cooperate
+ ** and share ownership with other shared_ptr instantiations.
+ ** 
+ ** By default different instantiations of shared_ptr are completely unrelated types,
+ ** even if using inherintance related type parameters for instantiation: a shared_ptr<Media>
+ ** isn't some kind-of shared_ptr<Asset> -- we need to do an explicit static_ptr_cast. Another
+ ** common problem is the definition of equality and ordering relations for shared_ptr: 
+ ** equality is based on the equality of the managed pointers, while ordering is built upon
+ ** the ref count. While generally this may be a good compromise, in our case it hinders treating
+ ** the smart ptrs within the application almost as if they were the objects themselfs and proved
+ ** an obstacle for writing generic helper functions.
+ **
+ ** the P template resolves these problems by implementing the ordering operators in terms of
+ ** the corresponding operators on the pointee and by allowing to specify a base class smart-ptr
+ ** as template parameter.
+ **
+ ** @see asset.hpp
+ ** @see customsharedptrtest.cpp
+ ** @see orderingofassetstest.cpp
+ */
+
+
+#ifndef LUMIERA_P_H
+#define LUMIERA_P_H
+
+
+#include <tr1/memory>
+
+
+namespace lumiera
+  {
+  using std::tr1::shared_ptr;
+  using std::tr1::weak_ptr;
+  
+  /**
+   * customized refcounting smart pointer template, built upon
+   * std::tr1::shared_ptr, but forwarding type relationships and
+   * ordering operators to the pointee objects.
+   * @param TAR the visible pointee type
+   * @param the shared-ptr type used as implementation
+   * @note if the BASE smart-ptr type used as implementation
+   *       implies another pointer type than the one used on
+   *       the interface (=type TAR), then every access to the 
+   *       pointee causes an dynamic cast. Thus the pointee types
+   *       need to support RTTI.
+   */
+  template<class TAR, class BASE =shared_ptr<TAR> >
+  class P
+    : public BASE
+    {
+    public:
+                                 P ( )                      : BASE() {}
+      template<class Y> explicit P (Y* p)                   : BASE(p) {}
+      template<class Y, class D> P (Y* p, D d)              : BASE(p,d){}
+
+                                 P (P const& r)             : BASE(r)  {}
+      template<class Y>          P (shared_ptr<Y> const& r) : BASE(r)  {}
+      template<class Y> explicit P (weak_ptr<Y> const& wr)  : BASE(wr) {}
+      template<class Y> explicit P (std::auto_ptr<Y> & ar)  : BASE(ar) {}      
+    
+      
+      P& operator= (P const& r)                               { BASE::operator= (r);  return *this; }  
+      template<class Y> P& operator=(shared_ptr<Y> const& sr) { BASE::operator= (sr); return *this; }
+      template<class Y> P& operator=(std::auto_ptr<Y> & ar)   { BASE::operator= (ar); return *this; }
+
+      TAR* get() const        { return dynamic_cast<TAR*> (BASE::get()); }
+      TAR& operator*() const  { return *get(); }
+      TAR* operator->() const { return get();  }
+
+      void swap(P& b)         { BASE::swap (b);}
+      
+    
+    private: /* === friend operators injected into enclosing namespace for ADL === */
+      template<typename _O_>
+      friend inline bool
+      operator== (P const& p, P<_O_> const& q) { return (p && q)? (*p == *q) : (!p && !q); }
+  
+      template<typename _O_>
+      friend inline bool
+      operator!= (P const& p, P<_O_> const& q) { return (p && q)? (*p != *q) : !(!p && !q); }
+  
+      template<typename _O_>
+      friend inline bool
+      operator<  (P const& p, P<_O_> const& q) { return (p && q) && (*p < *q); }
+  
+      template<typename _O_>
+      friend inline bool
+      operator>  (P const& p, P<_O_> const& q) { return (p && q) && (*q < *p); }
+
+      template<typename _O_>
+      friend inline bool
+      operator<= (P const& p, P<_O_> const& q) { return (p && q)? (*p <= *q) : (!p && !q); }
+
+      template<typename _O_>
+      friend inline bool
+      operator>= (P const& p, P<_O_> const& q) { return (p && q)? (*p >= *q) : (!p && !q); }
+      
+    };
+   
+    
+} // namespace lumiera
+#endif
diff --git a/src/tool/SConscript b/src/tool/SConscript
index 738483498..bf069ebfb 100644
--- a/src/tool/SConscript
+++ b/src/tool/SConscript
@@ -3,11 +3,11 @@
 ## SConscript  -  SCons buildscript for tool subdirectory (called by SConstruct)
 ##
 
-Import('env','artifacts')
+Import('env','artifacts','core')
 
 
 # build the ubiquitous Hello World application (note: C source)
 artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c')
-                     + env.Program('#$BINDIR/try', 'try.cpp')          #### to try out some feature:
+                     + env.Program('#$BINDIR/try', ['try.cpp'] + core)          #### to try out some feature:
                      ]
 
diff --git a/src/tool/try.cpp b/src/tool/try.cpp
index 349ca7db0..2151f4e84 100644
--- a/src/tool/try.cpp
+++ b/src/tool/try.cpp
@@ -7,18 +7,90 @@
 //         execute with   NOBUG_LOG='ttt:TRACE' bin/try
 // 1/08  - working out a static initialisation problem for Visitor (Tag creation)
 // 1/08  - check 64bit longs
+// 4/08  - comparison operators on shared_ptr<Asset>
 
 
 #include <nobug.h>
 #include <iostream>
+#include <typeinfo>
 
-#include <limits>
+#include "proc/asset/media.hpp"
 
 
 using std::string;
 using std::cout;
 
-NOBUG_CPP_DEFINE_FLAG(test);
+
+namespace lumiera
+  {
+  using std::tr1::shared_ptr;
+  using std::tr1::weak_ptr;
+  
+  template<class TAR, class BASE=std::tr1::shared_ptr<TAR> >
+  class P
+    : public BASE
+    {
+    public:
+      P() : BASE() {}
+      template<class Y> explicit P (Y* p) : BASE(p) {}
+      template<class Y, class D> P (Y* p, D d) : BASE(p,d) {}
+
+      P (P const& r) : BASE(r) {}
+      template<class Y> P (shared_ptr<Y> const& r) : BASE(r) {}
+      template<class Y> explicit P (weak_ptr<Y> const& wr) : BASE(wr) {}
+      template<class Y> explicit P (std::auto_ptr<Y> & ar) : BASE(ar) {}      
+
+    private:
+      // friend operators injected into enclosing namespace and found by ADL:
+      template<typename _O_>
+      friend inline bool
+      operator== (P const& p, P<_O_> const& q) { return (p && q)? (*p == *q) : (!p && !q); }
+  
+      template<typename _O_>
+      friend inline bool
+      operator!= (P const& p, P<_O_> const& q) { return (p && q)? (*p != *q) : !(!p && !q); }
+  
+      template<typename _O_>
+      friend inline bool
+      operator<  (P const& p, P<_O_> const& q) { return (p && q) && (*p < *q); }
+  
+      template<typename _O_>
+      friend inline bool
+      operator>  (P const& p, P<_O_> const& q) { return (p && q) && (*q < *p); }
+
+      template<typename _O_>
+      friend inline bool
+      operator<= (P const& p, P<_O_> const& q) { return (p && q)? (*p <= *q) : (!p && !q); }
+
+      template<typename _O_>
+      friend inline bool
+      operator>= (P const& p, P<_O_> const& q) { return (p && q)? (*p >= *q) : (!p && !q); }
+      
+    };
+}
+  
+namespace asset
+  {
+  using lumiera::P;
+  
+  
+  void 
+  doIt()
+  {
+    Asset::Ident key2("Try-1", Category(VIDEO));
+    P<Asset> a1 = asset::Media::create(key2, "Name-1");
+    
+    Asset::Ident key3("Try-2", Category(VIDEO));
+    P<Media> a2 = asset::Media::create(key3, "Name-2");
+    
+    cout << "a1 = " << str(a1);
+    
+    bool yes = (a1 >= a2);
+    enable_if<is_pAsset<PAsset>, string>::type yup;
+    
+    cout << "\n yes=" << yes << " yup=" << typeid(*a1).name();
+  }
+}
 
 
 int main (int argc, char* argv[])
@@ -26,12 +98,10 @@ int main (int argc, char* argv[])
     
     NOBUG_INIT;
     
-    int64_t lol (1);
-    cout << sizeof(lol)<< "\n";
+    asset::doIt();
+    
+    cout <<  "\ngulp\n";
     
-    cout << "long: "<< std::numeric_limits<long>::max() 
-         <<" 64: " <<  std::numeric_limits<int64_t>::max()
-         <<"\n";
     
     return 0;
   }
diff --git a/tests/50components.tests b/tests/50components.tests
index 0377d08c6..10cf575a5 100644
--- a/tests/50components.tests
+++ b/tests/50components.tests
@@ -2,7 +2,6 @@ TESTING "Component Test Suite: common and basic components" ./test-components --
 
 
 
-
 TEST "Hello test" HelloWorld_test 3 <<END
 out: This is how the world ends...
 out: This is how the world ends...
@@ -51,6 +50,11 @@ out: Standard Cmdlineformat:one  two
 END
 
 
+TEST "CustomSharedPtr_test" CustomSharedPtr_test <<END
+return: 0
+END
+
+
 TEST "ExceptionError_test" ExceptionError_test <<END
 out: caught: LUMIERA_ERROR_LIFE_AND_UNIVERSE:and everything? (don't panic)...the answer is: 42
 out: caught lumiera::Error: LUMIERA_ERROR_DERIVED:convoluted exception
@@ -103,6 +107,20 @@ out: dtor ~TargetObj(12) successfull
 END
 
 
+TEST "RemoveFromSet_test" RemoveFromSet_test <<END
+out: removed  nothing  ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ]
+out: removed 0 ---> [ 1, 2, 3, 4, 5, 6, 7, 8, 9, ]
+out: removed 9 ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8, ]
+out: removed 5 ---> [ 0, 1, 2, 3, 4, 6, 7, 8, 9, ]
+out: removed 0   2   4   6   8   ---> [ 1, 3, 5, 7, 9, ]
+out: removed   1   3   5   7   9 ---> [ 0, 2, 4, 6, 8, ]
+out: removed 0 1 2 3 4 5 6 7 8 9 ---> [ ]
+out: removed 0 1 2 3 4 5 6 7 8   ---> [ 9, ]
+out: removed   1 2 3 4 5 6 7 8 9 ---> [ 0, ]
+out: removed 0 1 2 3 4   6 7 8 9 ---> [ 5, ]
+END
+
+
 TEST "SanitizedIdentifier_test" SanitizedIdentifier_test <<END
 out: 'Word' --> 'Word'
 out: 'a Sentence' --> 'a_Sentence'
diff --git a/tests/components/common/customsharedptrtest.cpp b/tests/components/common/customsharedptrtest.cpp
new file mode 100644
index 000000000..7be41b801
--- /dev/null
+++ b/tests/components/common/customsharedptrtest.cpp
@@ -0,0 +1,315 @@
+/*
+  CustomSharedPtr(Test)  -  refcounting, equality and comparisons
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "common/test/run.hpp"
+#include "common/util.hpp"
+
+#include "common/p.hpp"
+
+#include <boost/operators.hpp>
+
+using std::string;
+
+
+namespace asset
+  {
+  namespace test
+    {
+    using lumiera::P;
+    using std::tr1::shared_ptr;
+    using std::tr1::weak_ptr;
+    
+    
+    struct X 
+      : boost::totally_ordered<X>
+      {
+        long x_;
+        
+        X(long x=0)  : x_(x) {}
+        operator long () { return x_; }
+        
+        bool operator<  (const X& ox)  const { return x_ <  ox.x_; }
+        bool operator== (const X& ox)  const { return x_ == ox.x_; }
+        
+        virtual ~X() {} // using RTTI
+      };
+    
+    struct XX : public X
+      {
+        long xx_;
+        
+        XX(long x=0)  : X(x), xx_(x+1) {}
+      };
+    
+      
+    /****************************************************************
+     * @test assure correct behaviour of lumiera's custom shared-ptr,
+     *       including ADL of operators, shared ownership, typing
+     *       and ordering
+     * @see  lumiera::P
+     */
+    class CustomSharedPtr_test : public Test
+      {
+        virtual void
+        run (Arg arg) 
+          {
+            check_refcounting ();
+            check_shared_ownership ();
+            check_type_relations ();
+            check_ordering ();
+          }
+        
+        
+        /** @test smart-ptr basic behaviour */
+        void
+        check_refcounting ()
+          {
+            P<X> p1 (new X(7));
+            ASSERT (p1);
+            ASSERT (1 == p1.use_count());
+            ASSERT (7 == p1->x_);
+            
+              {
+                P<X> p2 (new X(9));
+                ASSERT (1 == p2.use_count());
+
+                p2.swap (p1);
+                ASSERT (1 == p1.use_count());
+                ASSERT (1 == p2.use_count());
+                
+                p2 = p1;
+                ASSERT (2 == p1.use_count());
+                ASSERT (2 == p2.use_count());
+              }
+              
+            ASSERT (1 == p1.use_count());
+            ASSERT (9 == p1->x_);
+            
+            p1.reset();
+            ASSERT (0 == p1.use_count());
+            ASSERT (!p1);
+          }
+        
+        
+        /** @test cooperation with other shared-ptr types */
+        void
+        check_shared_ownership ()
+          {
+            std::auto_ptr<X> au (new X(22));
+            ASSERT (au.get());
+            
+            P<X> pX (au);
+            ASSERT (!au.get());
+            ASSERT (pX);
+            ASSERT (1 == pX.use_count());
+            ASSERT (22 == pX->x_);
+            
+            weak_ptr<X> wX (pX);
+            ASSERT (wX.lock());
+            ASSERT (1 == pX.use_count());
+            
+            shared_ptr<X> sp1 (wX);
+            shared_ptr<X> sp2 (pX); 
+            shared_ptr<X> sp3; sp3 = pX;
+            
+            ASSERT (22 == sp3->x_);
+            ASSERT (4 == pX.use_count());
+            ASSERT (*pX  == *sp1);
+            ASSERT (*sp1 == *sp2);
+            ASSERT (*sp2 == *sp3);
+            
+            P<X> pX2;
+            pX2.swap(pX);
+            ASSERT (!pX);
+            ASSERT (0 == pX.use_count());
+            ASSERT (4 == pX2.use_count());
+            
+            P<X, P<X> > pXX (pX2);  // a different type, but compatible pointers
+            pX2 = pX;
+            ASSERT (!pX2);
+            ASSERT (0 == pX2.use_count());
+            ASSERT (4 == pXX.use_count());
+            
+            sp3 = sp2 = sp1 = pX;
+            ASSERT (22 == pXX->x_);
+            ASSERT (1 == pXX.use_count());
+            ASSERT (!sp1);
+            ASSERT (!sp2);
+            ASSERT (!sp3);
+            
+            ASSERT (22 == wX.lock()->x_);
+            ASSERT (1 == pXX.use_count());
+
+            pXX.reset();
+            ASSERT (!pXX);
+            ASSERT (!wX.lock());
+          }
+        
+        
+        /** @test building type relationships on smart-ptrs */
+        void
+        check_type_relations ()
+          {
+            P<X> pX;                    // Base: shared_ptr<X>
+            P<XX> pX1;                  // Base: shared_ptr<XX>
+            P<XX,P<X> > pX2;            // Base: P<X>
+            P<XX,shared_ptr<X> > pX3;   // Base: shared_ptr<X>
+            P<XX,shared_ptr<long> > pLo;// Base: shared_ptr<long>
+            P<X,string> pLoL;           // Base: std::string
+            P<string> pLoLoL;           // Base: shared_ptr<string>
+            
+            ASSERT (INSTANCEOF (P<X>, &pX));
+            ASSERT (INSTANCEOF (shared_ptr<X>, &pX));
+            
+            ASSERT ( INSTANCEOF (shared_ptr<XX>, &pX1));
+//          ASSERT (!INSTANCEOF (shared_ptr<X>,  &pX1));     // doesn't compile (no RTTI) -- that's OK
+//          ASSERT (!INSTANCEOF (P<X>,           &pX1));
+            
+            ASSERT ( INSTANCEOF (shared_ptr<X>,  &pX2));
+//          ASSERT (!INSTANCEOF (shared_ptr<XX>, &pX2));
+            ASSERT ( INSTANCEOF (P<X>,           &pX2));
+            
+            ASSERT ( INSTANCEOF (shared_ptr<X>,  &pX3));
+//          ASSERT (!INSTANCEOF (shared_ptr<XX>, &pX3));
+//          ASSERT (!INSTANCEOF (P<X>,           &pX3));
+            
+            ASSERT ( INSTANCEOF (shared_ptr<long>, &pLo));
+//          ASSERT (!INSTANCEOF (shared_ptr<X>,    &pLo));
+//          ASSERT (!INSTANCEOF (P<X>,             &pLo));
+            
+//          ASSERT (!INSTANCEOF (shared_ptr<long>, &pLoL));
+//          ASSERT (!INSTANCEOF (shared_ptr<X>,    &pLoL));
+//          ASSERT (!INSTANCEOF (P<X>,             &pLoL));
+            ASSERT ( INSTANCEOF (string,           &pLoL));
+            
+            ASSERT ( INSTANCEOF (shared_ptr<string>, &pLoLoL));
+//          ASSERT (!INSTANCEOF (string,             &pLoLoL));
+//          ASSERT (!INSTANCEOF (shared_ptr<X>,      &pLoLoL));
+            
+            pX = pX1;   // OK: pointee subtype...
+            pX = pX2;   // invokes shared_ptr<X>::operator= (shared_ptr<X> const&)
+            pX = pX3;
+//          pX = pLo;   // similar, but long*   not asignable to X*
+//          pX = pLoL;  // similar, but string* not asignable to X*
+//          pX = pLoLoL;   // same...
+                          //  you can't do much with the "LoLo"-Types, 
+                         //   their types and pointee types's relations don't match
+            
+            pX.reset (new XX(5));
+            ASSERT (5 == *pX);      // implicit conversion from X to long
+            
+            pX2 = pX;               // works, because both are implemented in terms of shared_ptr<X>
+            ASSERT (5 == pX2->x_); 
+            ASSERT (6 == pX2->xx_); // using the XX interface (performing dynamic downcast)
+            
+            pX3.reset (new X(7));   // again works because implemented in terms of shared_ptr<X> 
+            pX2 = pX3;              // same
+            ASSERT (pX2);           // both contain indeed a valid pointer....
+            ASSERT (pX3);
+            ASSERT (! pX2.get());        // but dynamic cast to XX at access fails
+            ASSERT (! pX3.get());
+          }
+        
+        
+        /** @test equality and ordering operators forwarded to pointee */
+        void
+        check_ordering ()
+          {
+            typedef P<X> PX;
+            typedef P<XX,PX> PXX;
+            
+            PX pX1 (new X(3));
+            PX pX2 (new XX(5));
+            PX pX3, pX4, pX5, pX6;
+            PXX pXX (new XX(7));
+
+            pX3 = pXX;
+            pX4.reset(new X(*pXX));
+            
+            ASSERT ( (pX1 == pX1));    // reflexivity
+            ASSERT (!(pX1 != pX1));
+            ASSERT (!(pX1 <  pX1));
+            ASSERT (!(pX1 >  pX1));
+            ASSERT ( (pX1 <= pX1));
+            ASSERT ( (pX1 >= pX1));
+            
+            ASSERT (!(pX1 == pX2));    // compare to same ptr type with larger pointee of subtype
+            ASSERT ( (pX1 != pX2));
+            ASSERT ( (pX1 <  pX2));
+            ASSERT (!(pX1 >  pX2));
+            ASSERT ( (pX1 <= pX2));
+            ASSERT (!(pX1 >= pX2));
+            
+            ASSERT (!(pX2 == pXX));    // compare to ptr subtype with larger pointee of same subtype
+            ASSERT ( (pX2 != pXX));
+            ASSERT ( (pX2 <  pXX));
+            ASSERT (!(pX2 >  pXX));
+            ASSERT ( (pX2 <= pXX));
+            ASSERT (!(pX2 >= pXX));
+            
+            ASSERT (!(pX1 == pXX));    // transitively compare to ptr subtype with larger pointee of subtype
+            ASSERT ( (pX1 != pXX));
+            ASSERT ( (pX1 <  pXX));
+            ASSERT (!(pX1 >  pXX));
+            ASSERT ( (pX1 <= pXX));
+            ASSERT (!(pX1 >= pXX));
+            
+            ASSERT ( (pX3 == pXX));    // compare ptr to subtype ptr both referring to same pointee
+            ASSERT (!(pX3 != pXX));
+            ASSERT (!(pX3 <  pXX));
+            ASSERT (!(pX3 >  pXX));
+            ASSERT ( (pX3 <= pXX));
+            ASSERT ( (pX3 >= pXX));
+            
+            ASSERT ( (pX4 == pXX));    // compare ptr to subtype ptr both referring to different but equal pointees 
+            ASSERT (!(pX4 != pXX));
+            ASSERT (!(pX4 <  pXX));
+            ASSERT (!(pX4 >  pXX));
+            ASSERT ( (pX4 <= pXX));
+            ASSERT ( (pX4 >= pXX));
+            
+            ASSERT (!(pXX == pX5));    // compare subtype ptr to empty ptr: "unequal but not orderable"
+            ASSERT ( (pXX != pX5));
+            ASSERT (!(pXX <  pX5));
+            ASSERT (!(pXX >  pX5));
+            ASSERT (!(pXX <= pX5));
+            ASSERT (!(pXX >= pX5));
+            
+            ASSERT ( (pX5 == pX6));    // compare two empty ptrs: "equal, aequivalent but not orderable"
+            ASSERT (!(pX5 != pX6));
+            ASSERT (!(pX5 <  pX6));
+            ASSERT (!(pX5 >  pX6));
+            ASSERT ( (pX5 <= pX6));
+            ASSERT ( (pX5 >= pX6));
+          }
+      };
+    
+    
+    /** Register this test class... */
+    LAUNCHER (CustomSharedPtr_test, "unit common");
+    
+    
+    
+  } // namespace test
+
+} // namespace asset

From dffd635482f6e9d098f00f096299cf54359d1fd9 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 5 Apr 2008 07:26:54 +0200
Subject: [PATCH 18/36] switch asset ordering impl to utilize the new custom
 smart-ptr passes compiler and test suite, finally! TODO: also switch the
 derived asset kinds to use P<Media>, P<Struct>,.... maybe do the same with
 MObject?

---
 src/common/query/mockconfigrules.hpp          |  4 +-
 src/common/test/testoption.cpp                |  3 +-
 src/proc/asset.hpp                            | 48 +++++-------
 src/proc/asset/db.hpp                         |  7 +-
 src/proc/assetmanager.cpp                     |  3 +-
 src/proc/mobject/session/defsregistry.hpp     |  4 +-
 src/tool/SConscript                           |  2 +-
 src/tool/try.cpp                              | 73 -------------------
 .../proc/asset/assetdiagnostics.hpp           |  8 +-
 tests/components/proc/asset/basicpipetest.cpp |  9 ++-
 .../components/proc/asset/createassettest.cpp | 18 ++++-
 .../proc/asset/dependantassetstest.cpp        |  4 +-
 tests/components/proc/asset/makecliptest.cpp  |  2 +-
 .../proc/asset/orderingofassetstest.cpp       | 12 ++-
 tests/components/proc/asset/testasset.cpp     |  6 +-
 tests/components/proc/asset/testasset.hpp     |  2 +-
 16 files changed, 70 insertions(+), 135 deletions(-)

diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index 5a1531cc9..f01d3268d 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -50,7 +50,6 @@
 
 namespace lumiera
   {
-  //using std::string;
   
   
   namespace query
@@ -114,8 +113,7 @@ namespace lumiera
               {
                 const Ret& candidate (any_cast<const Ret&> (entry));
                 if (! solution
-//                   ||(solution && *solution == *candidate)    // simulates a real unification
-//////////////TODO: not only Assets (i.e. define comparison Operators on Assets!)
+                   ||(solution &&  solution == candidate)    // simulates a real unification
                    )
                   return solution = candidate;
               }
diff --git a/src/common/test/testoption.cpp b/src/common/test/testoption.cpp
index aaaff32b8..8b1199887 100644
--- a/src/common/test/testoption.cpp
+++ b/src/common/test/testoption.cpp
@@ -1,5 +1,5 @@
 /*
-  Suite  -  helper class for running collections of tests
+  Suite  -  handle cmdline for invoking Testsuite
  
   Copyright (C)         Lumiera.org
     2008,               Hermann Vosseler <Ichthyostega@web.de>
@@ -45,6 +45,7 @@ namespace test
    *  \code
    *  --help
    *  --group <groupID>
+   *  --describe
    *  \endcode
    */
   TestOption::TestOption (util::Cmdline& cmdline)
diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp
index b9a85e5ae..7088b8324 100644
--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@@ -59,14 +59,16 @@
 
 #include "proc/asset/category.hpp"
 #include "common/error.hpp"
+#include "common/p.hpp"
+
+#include <boost/type_traits/is_base_of.hpp>
+#include <boost/operators.hpp>
+#include <boost/utility.hpp>
 
 #include <cstddef>
 #include <string>
 #include <vector>
 #include <set>
-#include <tr1/memory>
-#include <boost/operators.hpp>
-#include <boost/utility.hpp>
 
 
 using std::string;
@@ -81,6 +83,8 @@ namespace asset
   using std::size_t;
   using std::tr1::shared_ptr;
   using std::tr1::static_pointer_cast;
+
+  using lumiera::P;
   
   
   /** 
@@ -109,8 +113,8 @@ namespace asset
   class Asset;
   class AssetManager;
   typedef const ID<Asset>& IDA;
-  typedef shared_ptr<Asset> PAsset;
-  typedef shared_ptr<const Asset> PcAsset;
+  typedef P<Asset>       PAsset;
+  typedef P<const Asset> PcAsset;
 
   
   
@@ -135,7 +139,7 @@ namespace asset
    * @author Ichthyo
    */
   class Asset 
-    : boost::totally_ordered< Asset,
+    : boost::totally_ordered1< Asset,
         boost::noncopyable>
     {
     public:
@@ -299,6 +303,9 @@ namespace asset
     
     /** ordering of Assets is based on the ordering
      *  of Ident tuples, which are supposed to be unique.
+     *  By using our customized lumiera::P as smart ptr,
+     *  comparison on P<Asset> ptrs will be automatically
+     *  forwarded to the Asset comparison operators.
      *  @note version info is irrelevant */
     inline int 
     Asset::Ident::compare (const Asset::Ident& oi)  const
@@ -309,6 +316,7 @@ namespace asset
       return name.compare (oi.name);
     }
     
+    
     /** promote subtype-ptr to PAsset, e.g. for comparing */
     template<class A>
     inline const PcAsset
@@ -316,31 +324,15 @@ namespace asset
     {
       return static_pointer_cast<const Asset,A> (subPtr);
     }
-
-    /** ordering of Asset smart ptrs based on Ident tuple.
-     *  @todo currently supporting only smart_ptr<Asset>.
-     *  @todo should better be done using boost::operator */
-    inline bool operator== (PcAsset const& a1, PcAsset const& a2) { return a1 && a2 && ( (*a1) == (*a2));}
-    inline bool operator<  (PcAsset const& a1, PcAsset const& a2) { return a1 && a2 && ( (*a1) <  (*a2));}
-
-    template<class PA1, class PA2>
-    inline bool operator== (PA1 const& a1, PA2 const& a2)  { return pAsset(a1) == pAsset(a2); }
-    
-    template<class PA1, class PA2>
-    inline bool operator<  (PA1 const& a1, PA2 const& a2)  { return pAsset(a1) <  pAsset(a2); }
     
     
-    /** build ordering of Asset shared pointers on the ordering of the pointed to assets.
-     *  Because we can't define member operators for shared-ptrs, we explicitly instantiate
-     *  the boost ordering concept template for all Asset kinds we want to use...
-     */
-    template<class PTR>
-    struct asset_total_ordering : public boost::totally_ordered<PTR> 
-    { };
-    
-    template struct asset_total_ordering<PAsset>;
-    template struct asset_total_ordering<PcAsset>;
+    /** type trait for detecting a shared-ptr-to-asset */
+    template <class X>
+    struct is_pAsset : boost::false_type {};
     
+    template <class A>
+    struct is_pAsset<shared_ptr<A> >
+      : boost::is_base_of<Asset, A>      {}; 
     
     
     /** convienient for debugging */
diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp
index 0f385f96d..493a188cf 100644
--- a/src/proc/asset/db.hpp
+++ b/src/proc/asset/db.hpp
@@ -28,6 +28,7 @@
 #include "proc/asset.hpp"
 #include "common/error.hpp"
 
+#include <tr1/memory>
 #include <tr1/unordered_map>
 #include <boost/utility.hpp>
 
@@ -92,9 +93,9 @@ namespace asset
       
     public:
       template<class KIND>
-      void  put (ID<KIND> hash, shared_ptr<KIND>& ptr) { table[hash] = static_pointer_cast (ptr);  }
-      void  put (ID<Asset> hash, PAsset& ptr)          { table[hash] = ptr; }
-      bool  del (ID<Asset> hash)                       { return table.erase (hash); }
+      void  put (ID<KIND> hash, P<KIND>& ptr) { table[hash] = static_pointer_cast (ptr);  }
+      void  put (ID<Asset> hash, PAsset& ptr) { table[hash] = ptr; }
+      bool  del (ID<Asset> hash)              { return table.erase (hash); }
       
       template<class KIND>
       shared_ptr<KIND> 
diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp
index 47b11f52e..fcdf45dc0 100644
--- a/src/proc/assetmanager.cpp
+++ b/src/proc/assetmanager.cpp
@@ -112,14 +112,13 @@ namespace asset
   AssetManager::reg (KIND* obj, const Asset::Ident& idi)
       throw(lumiera::error::Invalid)
   {
-    typedef shared_ptr<KIND> PType;
     AssetManager& _aMang (AssetManager::instance());
     TODO ("check validity of Ident Category");
     ID<KIND> asset_id (getID (idi));
     
     Thread::Lock<DB> guard   SIDEEFFECT;
     TODO ("handle duplicate Registrations");
-    PType smart_ptr (obj, &destroy);
+    P<KIND> smart_ptr (obj, &destroy);
 
     _aMang.registry.put (asset_id, smart_ptr);
     return asset_id;
diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defsregistry.hpp
index 5a2328867..2bfec09ca 100644
--- a/src/proc/mobject/session/defsregistry.hpp
+++ b/src/proc/mobject/session/defsregistry.hpp
@@ -85,7 +85,7 @@ namespace mobject
               operator() (const Record& rec)
               {
                 shared_ptr<TAR> storedObj (rec.objRef.lock());
-                return storedObj && pAsset(storedObj)==pAsset(obj_);               //////////////TODO: not only Assets (i.e. define comparison Operators on Assets!)
+                return storedObj && (storedObj == obj_);
               }
             };
           
@@ -261,7 +261,7 @@ namespace mobject
               {
                 shared_ptr<TAR> storedObj (pos->objRef.lock());
                 if (storedObj)
-                  return (pAsset(storedObj) == pAsset(obj));               //////////////TODO: not only Assets (i.e. define comparison Operators on Assets!)
+                  return (storedObj == obj);
                 else
                   // use the opportunity and purge the expired entry
                   registry.erase(pos);
diff --git a/src/tool/SConscript b/src/tool/SConscript
index bf069ebfb..6f4e796a6 100644
--- a/src/tool/SConscript
+++ b/src/tool/SConscript
@@ -8,6 +8,6 @@ Import('env','artifacts','core')
 
 # build the ubiquitous Hello World application (note: C source)
 artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c')
-                     + env.Program('#$BINDIR/try', ['try.cpp'] + core)          #### to try out some feature:
+                     + env.Program('#$BINDIR/try', 'try.cpp')          #### to try out some feature...
                      ]
 
diff --git a/src/tool/try.cpp b/src/tool/try.cpp
index 2151f4e84..90bdfadf8 100644
--- a/src/tool/try.cpp
+++ b/src/tool/try.cpp
@@ -14,83 +14,12 @@
 #include <iostream>
 #include <typeinfo>
 
-#include "proc/asset/media.hpp"
 
 
 using std::string;
 using std::cout;
 
 
-namespace lumiera
-  {
-  using std::tr1::shared_ptr;
-  using std::tr1::weak_ptr;
-  
-  template<class TAR, class BASE=std::tr1::shared_ptr<TAR> >
-  class P
-    : public BASE
-    {
-    public:
-      P() : BASE() {}
-      template<class Y> explicit P (Y* p) : BASE(p) {}
-      template<class Y, class D> P (Y* p, D d) : BASE(p,d) {}
-
-      P (P const& r) : BASE(r) {}
-      template<class Y> P (shared_ptr<Y> const& r) : BASE(r) {}
-      template<class Y> explicit P (weak_ptr<Y> const& wr) : BASE(wr) {}
-      template<class Y> explicit P (std::auto_ptr<Y> & ar) : BASE(ar) {}      
-
-    private:
-      // friend operators injected into enclosing namespace and found by ADL:
-      template<typename _O_>
-      friend inline bool
-      operator== (P const& p, P<_O_> const& q) { return (p && q)? (*p == *q) : (!p && !q); }
-  
-      template<typename _O_>
-      friend inline bool
-      operator!= (P const& p, P<_O_> const& q) { return (p && q)? (*p != *q) : !(!p && !q); }
-  
-      template<typename _O_>
-      friend inline bool
-      operator<  (P const& p, P<_O_> const& q) { return (p && q) && (*p < *q); }
-  
-      template<typename _O_>
-      friend inline bool
-      operator>  (P const& p, P<_O_> const& q) { return (p && q) && (*q < *p); }
-
-      template<typename _O_>
-      friend inline bool
-      operator<= (P const& p, P<_O_> const& q) { return (p && q)? (*p <= *q) : (!p && !q); }
-
-      template<typename _O_>
-      friend inline bool
-      operator>= (P const& p, P<_O_> const& q) { return (p && q)? (*p >= *q) : (!p && !q); }
-      
-    };
-}
-  
-namespace asset
-  {
-  using lumiera::P;
-  
-  
-  void 
-  doIt()
-  {
-    Asset::Ident key2("Try-1", Category(VIDEO));
-    P<Asset> a1 = asset::Media::create(key2, "Name-1");
-    
-    Asset::Ident key3("Try-2", Category(VIDEO));
-    P<Media> a2 = asset::Media::create(key3, "Name-2");
-    
-    cout << "a1 = " << str(a1);
-    
-    bool yes = (a1 >= a2);
-    enable_if<is_pAsset<PAsset>, string>::type yup;
-    
-    cout << "\n yes=" << yes << " yup=" << typeid(*a1).name();
-  }
-}
 
 
 int main (int argc, char* argv[])
@@ -98,8 +27,6 @@ int main (int argc, char* argv[])
     
     NOBUG_INIT;
     
-    asset::doIt();
-    
     cout <<  "\ngulp\n";
     
     
diff --git a/tests/components/proc/asset/assetdiagnostics.hpp b/tests/components/proc/asset/assetdiagnostics.hpp
index 199338599..c7a698db6 100644
--- a/tests/components/proc/asset/assetdiagnostics.hpp
+++ b/tests/components/proc/asset/assetdiagnostics.hpp
@@ -71,14 +71,14 @@ namespace asset
     }
   
   
-  template<class C, class P>
+  template<class CHI, class PAR>
   inline bool
-  dependencyCheck (C child, P parent)
+  dependencyCheck (P<CHI> child, P<PAR> parent)
     {
-      return (pAsset(child) == pAsset(parent))
+      return (child == parent)
           || (0 < child->getParents().size()
              && (parent == child->getParents()[0])
-             && (contains (parent->getDependant(), child)));
+             && (contains (parent->getDependant(), child)))
           ;
     }
 
diff --git a/tests/components/proc/asset/basicpipetest.cpp b/tests/components/proc/asset/basicpipetest.cpp
index fb2541f20..d085f22d4 100644
--- a/tests/components/proc/asset/basicpipetest.cpp
+++ b/tests/components/proc/asset/basicpipetest.cpp
@@ -154,6 +154,9 @@ namespace asset
         
         void dependProcPatt(string pID)
           {
+            typedef P<Pipe> PPipe;                                                         /////TODO: transition to P<>
+            typedef P<const ProcPatt> PProcPatt;
+            
             PPipe thePipe = Pipe::query ("pipe("+pID+")");
             ASSERT (thePipe);
             PProcPatt thePatt = thePipe->getProcPatt();
@@ -186,11 +189,13 @@ namespace asset
             ASSERT (!aMang.known (thePipe->getID()));  // has been unlinked too, because dependant on pattern2
             
             ASSERT (thePipe);
+            PProcPatt pattern3 = thePipe->getProcPatt();                                   /////TODO: transition to P<>
             ASSERT (thePipe->getProcPatt());
-            ASSERT (thePipe->getProcPatt() == pattern2); // but is still valid, as long as the ref is alive....
+            ASSERT (              pattern3 == pattern2); // but is still valid, as long as the ref is alive....
             
             PPipe pipe3x = Pipe::query ("pattern(another)");
-            ASSERT (pipe3x->getProcPatt() != pattern2);  // because pattern2 is already unlinked...
+            pattern3 = pipe3x->getProcPatt();                                              /////TODO: transition to P<>
+            ASSERT (pattern3 != pattern2);  // because pattern2 is already unlinked...
             ASSERT (pipe3x == Session::current->defaults (Query<Pipe>("pattern(another)")));
             ASSERT (pipe3x != pipe2x);                 // ..we got a new default pipe for "pattern(another)" too!
             
diff --git a/tests/components/proc/asset/createassettest.cpp b/tests/components/proc/asset/createassettest.cpp
index d9302fc7c..530cb1413 100644
--- a/tests/components/proc/asset/createassettest.cpp
+++ b/tests/components/proc/asset/createassettest.cpp
@@ -60,7 +60,7 @@ namespace asset
         
         
         
-        typedef shared_ptr<asset::Media> PM;
+        typedef P<Media> PM;                                                         /////TODO: transition to P<>
         
         /** @test Creating and automatically registering Asset instances.
          *        Re-Retrieving the newly created objects from AssetManager.
@@ -78,12 +78,26 @@ namespace asset
             
             // Assets have been registered and can be retrieved by ID
             AssetManager& aMang = AssetManager::instance();
+            PM registered;                                                         /////TODO: transition to P<>
+            registered = aMang.getAsset (mm1->getID());
+            ASSERT (registered == mm1);
+            registered = aMang.getAsset (mm2->getID());
+            ASSERT (registered == mm2);
+            registered = aMang.getAsset (mm3->getID());
+            ASSERT (registered == mm3);
+            
+            registered = aMang.getAsset (mm1->getID());
+            ASSERT (registered != mm2);
+/* 
+ * TODO: switch back to original version
+ *       once the transition to P<XX> ist done...
+ * 
             ASSERT (aMang.getAsset (mm1->getID()) == mm1);
             ASSERT (aMang.getAsset (mm2->getID()) == mm2);
             ASSERT (aMang.getAsset (mm3->getID()) == mm3);
             
             ASSERT (aMang.getAsset (mm1->getID()) != mm2);
-            
+*/            
             PAsset aa1 = aMang.getAsset (ID<Asset>(mm1->getID()));   // note we get an Asset ref
             ASSERT (aa1 == mm1);
             PM mX1 = aMang.getAsset (mm1->getID());                // ..and now we get a Media ref
diff --git a/tests/components/proc/asset/dependantassetstest.cpp b/tests/components/proc/asset/dependantassetstest.cpp
index c9125b5d3..63ea2f57e 100644
--- a/tests/components/proc/asset/dependantassetstest.cpp
+++ b/tests/components/proc/asset/dependantassetstest.cpp
@@ -194,8 +194,8 @@ namespace asset
         void checkRealAssetDependencyRegistration ()
           {
             // -----Media and Clip--------------------------------
-            typedef Media::PMedia PM;
-            typedef Media::PClip  PC;
+            typedef P<Media> PM;
+            typedef P<Clip>  PC;
             PM mm = asset::Media::create("test-1", VIDEO);
             PC cc = mm->createClip()->findClipAsset();
             ASSERT (dependencyCheck (cc,mm));
diff --git a/tests/components/proc/asset/makecliptest.cpp b/tests/components/proc/asset/makecliptest.cpp
index 83702d7c5..136abf05d 100644
--- a/tests/components/proc/asset/makecliptest.cpp
+++ b/tests/components/proc/asset/makecliptest.cpp
@@ -50,7 +50,7 @@ namespace asset
      */
     class MakeClip_test : public Test
       {
-        typedef shared_ptr<asset::Media> PM;
+        typedef P<asset::Media> PM;
         typedef asset::Media::PClipMO PC;
             
         virtual void run (Arg arg) 
diff --git a/tests/components/proc/asset/orderingofassetstest.cpp b/tests/components/proc/asset/orderingofassetstest.cpp
index 26d6aa50a..783770348 100644
--- a/tests/components/proc/asset/orderingofassetstest.cpp
+++ b/tests/components/proc/asset/orderingofassetstest.cpp
@@ -59,22 +59,20 @@ namespace asset
       {
         virtual void run(Arg arg) 
           {
-            typedef shared_ptr<Asset> PA;
-            
             Asset::Ident key1("Au-1", Category(AUDIO), "ichthyo", 5);
-            PA mm1 = asset::Media::create(key1, "Name-1");
+            PAsset mm1 = asset::Media::create(key1, "Name-1");
             
             Asset::Ident key2("Au-1", Category(AUDIO), "ichthyo", 7);
-            PA mm2 = asset::Media::create(key2, "Name-2");
+            PAsset mm2 = asset::Media::create(key2, "Name-2");
             
             Asset::Ident key3("Au-2", Category(AUDIO), "ichthyo", 5);
-            PA mm3 = asset::Media::create(key3, "Name-3");
+            PAsset mm3 = asset::Media::create(key3, "Name-3");
             
             Asset::Ident key4("Au-2", Category(AUDIO), "stega", 5);
-            PA mm4 = asset::Media::create(key4, "Name-4");
+            PAsset mm4 = asset::Media::create(key4, "Name-4");
             
             Asset::Ident key5("Au-1", Category(VIDEO), "ichthyo", 5);
-            PA mm5 = asset::Media::create(key5, "Name-5");
+            PAsset mm5 = asset::Media::create(key5, "Name-5");
             
             
             // ordering of keys
diff --git a/tests/components/proc/asset/testasset.cpp b/tests/components/proc/asset/testasset.cpp
index b48b64da1..42ddff7ad 100644
--- a/tests/components/proc/asset/testasset.cpp
+++ b/tests/components/proc/asset/testasset.cpp
@@ -79,7 +79,7 @@ namespace asset
      *  within AssetManager by the Asset base class ctor
      */
     template<class A>
-    shared_ptr<TestAsset<A> >
+    P<TestAsset<A> >
     TestAsset<A>::ptrFromThis ()
     {
       return static_pointer_cast<TestAsset<A>,Asset>
@@ -113,8 +113,8 @@ namespace asset
     template TestAsset<Asset>::TestAsset (PAsset& pRef);
     template TestAsset<Unknown>::TestAsset (PAsset& pRef);
     
-    template shared_ptr<TestAsset<Asset> >   TestAsset<Asset>::ptrFromThis ();
-    template shared_ptr<TestAsset<Unknown> > TestAsset<Unknown>::ptrFromThis ();
+    template P<TestAsset<Asset> >   TestAsset<Asset>::ptrFromThis ();
+    template P<TestAsset<Unknown> > TestAsset<Unknown>::ptrFromThis ();
     
   
   
diff --git a/tests/components/proc/asset/testasset.hpp b/tests/components/proc/asset/testasset.hpp
index 05f82c79e..e1abc57d2 100644
--- a/tests/components/proc/asset/testasset.hpp
+++ b/tests/components/proc/asset/testasset.hpp
@@ -58,7 +58,7 @@ namespace asset
         static void deleter (TestAsset<A>* aa) { delete aa; }
         
       public:
-        typedef shared_ptr<TestAsset<A> > PA;
+        typedef P<TestAsset<A> > PA;
         
         static PA create ()             { return (new TestAsset<A>       )->ptrFromThis(); }
         static PA create (PAsset& pRef) { return (new TestAsset<A> (pRef))->ptrFromThis(); }

From 24825a13f35a649690f561d2794051d95358f0aa Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 5 Apr 2008 22:52:20 +0200
Subject: [PATCH 19/36] registry for default objects now passing test

---
 src/proc/mobject/session/defsregistry.hpp     | 58 ++++++++++++++-----
 tests/51asset.tests                           | 16 ++---
 tests/52query.tests                           |  4 ++
 tests/53session.tests                         | 15 ++++-
 tests/{52engine.tests => 56engine.tests}      |  0
 .../components/common/customsharedptrtest.cpp |  8 +--
 .../proc/mobject/builder/buildsegmenttest.cpp |  1 +
 .../mobject/session/defsregistryimpltest.cpp  | 11 ++--
 8 files changed, 80 insertions(+), 33 deletions(-)
 create mode 100644 tests/52query.tests
 rename tests/{52engine.tests => 56engine.tests} (100%)

diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defsregistry.hpp
index 2bfec09ca..4aca10868 100644
--- a/src/proc/mobject/session/defsregistry.hpp
+++ b/src/proc/mobject/session/defsregistry.hpp
@@ -32,7 +32,9 @@
 #include <set>
 #include <vector>
 #include <tr1/memory>
+#include <boost/format.hpp>
 #include <boost/utility.hpp>
+#include <boost/lambda/lambda.hpp>
 
 
 namespace mobject
@@ -44,6 +46,10 @@ namespace mobject
     using lumiera::Thread;
     using lumiera::Query;
     
+    using std::string;
+    using boost::format;
+    using boost::lambda::_1;
+    using boost::lambda::var;  
     
     namespace // Implementation details
       {
@@ -58,8 +64,11 @@ namespace mobject
       
       uint maxSlots (0); ///< number of different registered Types
       
+      format dumpRecord ("%2i| %64s --> %s\n");
       
-      /** holding a single "default object" entry */
+      /** 
+       * holding a single "default object" entry 
+       */
       template<class TAR>
       struct Record
         {
@@ -90,15 +99,18 @@ namespace mobject
             };
           
           struct OrderRelation
-          {
-            inline bool
-            operator() (Record one, Record two) ///< @note doesn't touch the objRef
-              {
-                return (  one.degree < two.degree
-                       ||(one.degree == two.degree && one.query < two.query)
-                       );
-              }
-          };
+            {
+              inline bool
+              operator() (Record one, Record two) ///< @note doesn't touch the objRef
+                {
+                  return (  one.degree < two.degree
+                         ||(one.degree == two.degree && one.query < two.query)
+                         );
+                }
+            };
+            
+          operator string ()  const { return str (dumpRecord % degree % query % dumpObj()); }
+          string  dumpObj ()  const { shared_ptr<TAR> o (objRef.lock()); return o? string(*o):"dead"; }
         };
         
       /** every new kind of object (Type) creates a new
@@ -180,13 +192,14 @@ namespace mobject
               : p(from), i(from), e(to)
               {
                 if (i!=e) ++i;  // p is next to be tested, i always one ahead
-                ptr = findNext();
+                operator++ ();
               }
             
             Iter (II match, II from, II to) ///< returns direct match first, then ennumerates 
-              : p(match), i(from), e(to),
-                next(), ptr(findNext())
-              { }
+              : p(match), i(from), e(to)
+              { 
+                operator++ ();  // init to first element (or to null if emty)
+              }
             
             shared_ptr<TAR> findNext ()  throw()
               {
@@ -264,10 +277,11 @@ namespace mobject
                   return (storedObj == obj);
                 else
                   // use the opportunity and purge the expired entry
-                  registry.erase(pos);
+                  registry.erase(pos++);
               }
             // no existing entry....
             registry.insert(pos, entry);
+            ENSURE (registry.find (entry) != registry.end());
             return true;
           }
         
@@ -284,6 +298,20 @@ namespace mobject
             Registry& registry = Slot<TAR>::access(table_);
             return util::remove_if(registry, SearchFunc (obj));
           }
+        
+        
+        /** helper for diagnostics.
+         *  @note to use it, your objects need an operator string()
+         */
+        template<class TAR>
+        string dump()
+          {
+            string res;
+            util::for_each ( Slot<TAR>::access(table_)
+                           , var(res) += _1
+                           );
+            return res;
+          }
       };
 
       
diff --git a/tests/51asset.tests b/tests/51asset.tests
index 5e259e95e..0acc9c63a 100644
--- a/tests/51asset.tests
+++ b/tests/51asset.tests
@@ -11,6 +11,14 @@ return: 0
 END
 
 
+PLANNED "BasicPipe_test" BasicPort_test <<END
+END
+
+
+PLANNED "BasicTrack_test" BasicTrack_test <<END
+END
+
+
 PLANNED "CompoundMedia_test" CompoundMedia_test <<END
 END
 
@@ -34,14 +42,6 @@ return: 0
 END
 
 
-PLANNED "BasicPipe_test" BasicPort_test <<END
-END
-
-
-PLANNED "BasicTrack_test" BasicTrack_test <<END
-END
-
-
 TEST "MakeClip_test" MakeClip_test <<END
 return: 0
 END
diff --git a/tests/52query.tests b/tests/52query.tests
new file mode 100644
index 000000000..2905bb4b4
--- /dev/null
+++ b/tests/52query.tests
@@ -0,0 +1,4 @@
+TESTING "Proc Layer config rules Test Suite" ./test-components --group=query
+
+
+
diff --git a/tests/53session.tests b/tests/53session.tests
index f2ddc5181..dbf85bc75 100644
--- a/tests/53session.tests
+++ b/tests/53session.tests
@@ -6,7 +6,7 @@ PLANNED "AddClip_test" AddClip_test <<END
 END
 
 
-PLANNED "DeleteClip_test" DeleteClip_test <<END
+PLANNED "DefsManagerImpl_test" DefsManagerImpl_test <<END
 END
 
 
@@ -14,6 +14,19 @@ PLANNED "DefsManager_test" DefsManager_test <<END
 END
 
 
+TEST "DefsRegistryImpl_test" DefsRegistryImpl_test <<END
+return: 0
+END
+
+
+PLANNED "DeleteClip_test" DeleteClip_test <<END
+END
+
+
+PLANNED "PlacementBasic_test" PlacementBasic_test <<END
+END
+
+
 PLANNED "RebuildFixture_test" RebuildFixture_test <<END
 END
 
diff --git a/tests/52engine.tests b/tests/56engine.tests
similarity index 100%
rename from tests/52engine.tests
rename to tests/56engine.tests
diff --git a/tests/components/common/customsharedptrtest.cpp b/tests/components/common/customsharedptrtest.cpp
index 7be41b801..e32fa6b22 100644
--- a/tests/components/common/customsharedptrtest.cpp
+++ b/tests/components/common/customsharedptrtest.cpp
@@ -174,7 +174,7 @@ namespace asset
             P<XX> pX1;                  // Base: shared_ptr<XX>
             P<XX,P<X> > pX2;            // Base: P<X>
             P<XX,shared_ptr<X> > pX3;   // Base: shared_ptr<X>
-            P<XX,shared_ptr<long> > pLo;// Base: shared_ptr<long>
+            P<XX,shared_ptr<long> > pLo;// Base: shared_ptr<long>       (quite a nonsene, but well...)
             P<X,string> pLoL;           // Base: std::string
             P<string> pLoLoL;           // Base: shared_ptr<string>
             
@@ -182,7 +182,7 @@ namespace asset
             ASSERT (INSTANCEOF (shared_ptr<X>, &pX));
             
             ASSERT ( INSTANCEOF (shared_ptr<XX>, &pX1));
-//          ASSERT (!INSTANCEOF (shared_ptr<X>,  &pX1));     // doesn't compile (no RTTI) -- that's OK
+//          ASSERT (!INSTANCEOF (shared_ptr<X>,  &pX1));     // doesn't compile (no RTTI) -- that's correct
 //          ASSERT (!INSTANCEOF (P<X>,           &pX1));
             
             ASSERT ( INSTANCEOF (shared_ptr<X>,  &pX2));
@@ -212,8 +212,8 @@ namespace asset
 //          pX = pLo;   // similar, but long*   not asignable to X*
 //          pX = pLoL;  // similar, but string* not asignable to X*
 //          pX = pLoLoL;   // same...
-                          //  you can't do much with the "LoLo"-Types, 
-                         //   their types and pointee types's relations don't match
+                          //  you won't be able to do much with the "LoLo"-Types, 
+                         //   as their types and pointee types's relations don't match
             
             pX.reset (new XX(5));
             ASSERT (5 == *pX);      // implicit conversion from X to long
diff --git a/tests/components/proc/mobject/builder/buildsegmenttest.cpp b/tests/components/proc/mobject/builder/buildsegmenttest.cpp
index 82de68330..5fd44d988 100644
--- a/tests/components/proc/mobject/builder/buildsegmenttest.cpp
+++ b/tests/components/proc/mobject/builder/buildsegmenttest.cpp
@@ -51,6 +51,7 @@ namespace mobject
         {
           virtual void run(Arg arg) 
             {
+              UNIMPLEMENTED ("oh my");
             } 
         };
       
diff --git a/tests/components/proc/mobject/session/defsregistryimpltest.cpp b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
index 6a01f15c0..3bdc8f1f2 100644
--- a/tests/components/proc/mobject/session/defsregistryimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
@@ -75,6 +75,7 @@ namespace mobject
         {
           static string name;
           string instanceID;
+          operator string () const { return instanceID; }
           
           Dummy () : instanceID (newID (name)) {}
         };
@@ -89,14 +90,13 @@ namespace mobject
       {
         return str (predicatePatt 
                    % char ('a'+ rand() % 26)
-                   % rand() % 100
+                   % (rand() % 100)
                    % garbage.substr(rand() % 17 , 3)
                    );
       }
       
       string
       q_str (int degree=0)    ///< fabricating (random) query strings
-
       {
         string fake;
         if (!degree) 
@@ -197,6 +197,7 @@ namespace mobject
               ASSERT ( *i++ == o2);
               ASSERT ( *i   == o1);
               ASSERT (!i.hasNext());
+              ASSERT (! *++i ); // null after end
               
               i = reg_->candidates(q3);
               ASSERT ( *i++ == o3);  // found by direct match
@@ -272,7 +273,7 @@ namespace mobject
               ASSERT ( *i++ == o1);
               ASSERT (!i.hasNext());
               
-              ASSERT ( reg_->put (o2, q5));  // trying to (re)register o2 with a existing query
+              ASSERT (!reg_->put (o2, q5));  // trying to (re)register o2 with a existing query
                                              // counts as failure (nothing chages)
               i = reg_->candidates(q5);
               ASSERT ( *i++ == o1); // direct match
@@ -289,8 +290,8 @@ namespace mobject
               ASSERT (!i.hasNext());
               
               ASSERT ( reg_->forget (o1));
-              ASSERT ( reg_->forget (o1)); // failure, because it's already removed
-              ASSERT (!reg_->forget (o2)); 
+              ASSERT (!reg_->forget (o1)); // failure, because it's already removed
+              ASSERT ( reg_->forget (o2)); 
 
               o3 = oFac();        // another object is another object (it's irrelevant...) 
               

From b361fc96723d29f12c3b90fb68f480dda52487e3 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 6 Apr 2008 05:36:16 +0200
Subject: [PATCH 20/36] supplement tests for some small utils dealing with
 query expressions

---
 src/common/query.cpp                          |  22 ++-
 src/common/test/run.hpp                       |   2 +-
 src/common/util.hpp                           |   4 +-
 tests/50components.tests                      |   4 +-
 tests/52query.tests                           |  19 +++
 .../common/query/querydiagnostics.hpp         |  95 ++++++++++++
 .../common/query/queryutilstest.cpp           | 146 ++++++++++++++++++
 .../common/sanitizedidentifiertest.cpp        |   4 +-
 .../mobject/session/defsregistryimpltest.cpp  |  39 ++---
 9 files changed, 293 insertions(+), 42 deletions(-)
 create mode 100644 tests/components/common/query/querydiagnostics.hpp
 create mode 100644 tests/components/common/query/queryutilstest.cpp

diff --git a/src/common/query.cpp b/src/common/query.cpp
index 09c642f1c..d7fb51257 100644
--- a/src/common/query.cpp
+++ b/src/common/query.cpp
@@ -34,10 +34,9 @@ using boost::regex;
 using boost::smatch;
 using boost::regex_search;
 using boost::sregex_iterator;
-using boost::algorithm::is_upper;
-using boost::algorithm::is_alpha;
 
 using util::contains;
+using util::isnil;
 
 
 namespace lumiera
@@ -45,16 +44,29 @@ namespace lumiera
   
   namespace query
     {
+
+    namespace // local definitions
+      {
+      typedef boost::function<bool(string::value_type)> ChPredicate;
+      
+      ChPredicate is_alpha = boost::algorithm::is_alpha();    
+      ChPredicate is_upper = boost::algorithm::is_upper();    
+    } // local defs
+    
     
     void
     normalizeID (string& id)
     {
       id = util::sanitize(id);
-      REQUIRE (!util::isnil(id));
-      REQUIRE (is_alpha() (id[0]));
+      if (isnil(id) || !is_alpha (id[0]))
+        id.insert(0, "o");
+      
+      
+      REQUIRE (!isnil(id));
+      REQUIRE (is_alpha (id[0]));
       
       char first = id[0];
-      if (is_upper() (first))
+      if (is_upper (first))
         id[0] = std::tolower (first);
     }
 
diff --git a/src/common/test/run.hpp b/src/common/test/run.hpp
index b38729d8a..529896d0b 100644
--- a/src/common/test/run.hpp
+++ b/src/common/test/run.hpp
@@ -85,7 +85,7 @@ namespace test
     {
     public:
       Launch (string testID, string groups)  { Suite::enroll (this,testID,groups); };
-      virtual auto_ptr<Test> operator() ()  { return auto_ptr<Test> (new TEST ); };
+      virtual auto_ptr<Test> operator() ()   { return auto_ptr<Test> (new TEST ); };
     };   
     
 } // namespace test
diff --git a/src/common/util.hpp b/src/common/util.hpp
index d56a45432..7f8704554 100644
--- a/src/common/util.hpp
+++ b/src/common/util.hpp
@@ -197,8 +197,8 @@ namespace util
    "trailing Withespace  \t \n"       --> 'trailing_Withespace'
    "with    a   lot  \nof Whitespace" --> 'with_a_lot_of_Whitespace'
    "with\"much (punctuation)[]!"      --> 'withmuch_(punctuation)'
-   "§&Ω%€  leading garbarge"          --> 'leading_garbarge'
-   "mixed    Ω   garbarge"            --> 'mixed_garbarge'
+   "§&Ω%€  leading garbage"           --> 'leading_garbage'
+   "mixed    Ω   garbage"             --> 'mixed_garbage'
    "Bääääh!!"                         --> 'Bh'
 \endverbatim
    */
diff --git a/tests/50components.tests b/tests/50components.tests
index 10cf575a5..d2d38e5d0 100644
--- a/tests/50components.tests
+++ b/tests/50components.tests
@@ -129,8 +129,8 @@ out:        	' --> 'trailing_Withespace'
 out: 'with    a  	 lot
 out:   of Whitespace' --> 'with_a_lot_of_Whitespace'
 out: 'with"much (punctuation)[]!' --> 'withmuch_(punctuation)'
-out: '§&Ω%€  leading garbarge' --> 'leading_garbarge'
-out: 'mixed    Ω   garbarge' --> 'mixed_garbarge'
+out: '§&Ω%€  leading garbage' --> 'leading_garbage'
+out: 'mixed    Ω   garbage' --> 'mixed_garbage'
 out: 'Bääääh!!' --> 'Bh'
 out: '§&Ω%€' --> ''
 END
diff --git a/tests/52query.tests b/tests/52query.tests
index 2905bb4b4..ce5f4f31e 100644
--- a/tests/52query.tests
+++ b/tests/52query.tests
@@ -2,3 +2,22 @@ TESTING "Proc Layer config rules Test Suite" ./test-components --group=query
 
 
 
+TEST "QueryUtils_test" QueryUtils_test  Query  <<END
+out: N7lumiera5query4test5ThingE: I am writing a test sentence.
+END
+
+
+TEST "QueryUtils_test" QueryUtils_test  normalizeID  <<END
+out: ..original : a A AA dufte 1a _1 A_A BÄH    White  space  §&Ω%€GΩ%€ar  Ω  baäääääge!!!!!  : 
+out: normalized : a a aA dufte o1a o_1 a_A bH o white_space gar_bage :
+END
+
+
+TEST "QueryUtils_test" QueryUtils_test  extractID  <<END
+return: 0
+END
+
+
+TEST "QueryUtils_test" QueryUtils_test  countPraed  <<END
+return: 0
+END
diff --git a/tests/components/common/query/querydiagnostics.hpp b/tests/components/common/query/querydiagnostics.hpp
new file mode 100644
index 000000000..91bcbebbc
--- /dev/null
+++ b/tests/components/common/query/querydiagnostics.hpp
@@ -0,0 +1,95 @@
+/*
+  QUERYDIAGNOSTICS.hpp  -  herlpers for writing tests covering config queries
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+*/
+
+
+#ifndef LUMIERA_TEST_QUERY_QUERYDIAGNOSTICS_H
+#define LUMIERA_TEST_QUERY_QUERYDIAGNOSTICS_H
+
+
+//#include "common/factory.hpp"
+//#include "common/util.hpp"
+
+//#include <boost/algorithm/string.hpp>
+//#include <boost/lexical_cast.hpp>
+#include <boost/format.hpp>
+//#include <iostream>
+#include <cstdlib>
+
+//using boost::algorithm::join;
+//using boost::lexical_cast;
+using boost::format;
+using std::string;
+//using std::cout;
+using std::rand;
+
+
+
+namespace lumiera
+  {
+  namespace query
+    {
+    namespace test
+      {
+      
+      namespace // implementation constants
+        {
+        
+        format predicatePatt ("%s_%2i( %s )");
+        const string garbage ("asdfghjklqwertzuiop");
+  
+        const uint MAX_DEGREE_RAND = 9;
+        
+      }
+      
+      
+      
+      inline string
+      garbage_term ()         ///< yields a random string of 3 letters
+      {
+        return str (predicatePatt 
+                   % char ('a'+ rand() % 26)
+                   % (rand() % 100)
+                   % garbage.substr(rand() % 17 , 3)
+                   );
+      }
+      
+      inline string
+      garbage_query (int degree=0)    ///< fabricating (random) query strings
+      {
+        string fake;
+        if (!degree) 
+          degree = 1 + rand() % MAX_DEGREE_RAND;
+        while (0 < --degree)
+          fake += garbage_term() + ", ";
+        fake += garbage_term() + ".";
+        return fake;
+      }
+      
+      
+      
+      
+    } // namespace test
+    
+  } // namespace query
+
+} // namespace lumiera
+#endif
diff --git a/tests/components/common/query/queryutilstest.cpp b/tests/components/common/query/queryutilstest.cpp
new file mode 100644
index 000000000..6a5b7f375
--- /dev/null
+++ b/tests/components/common/query/queryutilstest.cpp
@@ -0,0 +1,146 @@
+/*
+  QueryUtils(Test)  -  checking various utils provided for dealing with config queries
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "common/test/run.hpp"
+#include "common/util.hpp"
+
+#include "common/cmdline.hpp"
+#include "common/query.hpp"
+#include "common/query/querydiagnostics.hpp"
+
+#include <boost/bind.hpp>
+#include <iostream>
+#include <cstdlib>
+
+using lumiera::Query;
+using util::Cmdline;
+using util::isnil;
+using util::contains;
+using util::for_each;
+
+using boost::bind;
+using std::string;
+using std::cout;
+
+
+
+namespace lumiera
+  {
+  namespace query
+    {
+    namespace test
+      {
+      
+      struct Thing
+        {
+          virtual ~Thing() {} // add RTTI for Query.asKey();
+        };
+      
+      
+      
+      /************************************************************************
+       * @test check the various small helpers and utilities we utilize
+       *       for dealing with ConfigQuery 
+       */
+      class QueryUtils_test : public Test
+        {
+          
+          virtual void
+          run (Arg arg) 
+            {
+              if (isnil(arg))  arg = Cmdline ("Query normalizeID extractID countPraed");
+              
+              if (contains (arg, "Query"      ))   check_Query ();
+              if (contains (arg, "normalizeID"))   check_normalizeID ();
+              if (contains (arg, "extractID"  ))   check_extractID ();
+              if (contains (arg, "countPraed" ))   check_countPraed ();
+            }
+          
+          
+          
+          /** @test Query wrapper class basics */
+          void
+          check_Query ()
+            {
+              cout << Query<Thing> ("I am writing a test sentence.").asKey() << "\n";
+            }
+          
+          
+          
+          /** @test sanitizing and normalizing various tokens */
+          void
+          check_normalizeID ()
+            {
+              Cmdline tokens ("a A AA dufte 1a _1 A_A BÄH");
+              tokens.push_back ("");
+              tokens.push_back ("  White  space ");
+              tokens.push_back ("§&Ω%€GΩ%€ar  Ω  baäääääge!!!!! ");
+              
+              cout << "..original : " << tokens << " :\n";
+              
+              for_each (tokens, bind ( &normalizeID, _1 ));
+              
+              cout << "normalized : " << tokens << " :\n";
+            }
+          
+          
+          
+          /** @test the simple regexp extracting a parameter token */
+          void
+          check_extractID ()
+            {
+              ASSERT ("tok" == extractID ("pred", "pred(tok)." ));
+              ASSERT ("tok" == extractID ("pred", "    pred( tok )" ));
+              ASSERT ("tok" == extractID ("pred", "pred(tok), pred(tux)." ));
+              ASSERT ("tok" == extractID ("pred", "other(xyz) pred(tok) pred(tux)" ));
+              ASSERT ("tok" == extractID ("pred", "some( pred(tok)" ));
+
+              ASSERT (isnil (extractID ("pred", "pred (tok)")));
+              ASSERT (isnil (extractID ("pred", "pred tok)" )));
+              ASSERT (isnil (extractID ("pred", "pred(tok " )));
+            }
+          
+          
+          
+          /** @test counting of predicates in a quiery
+           *  (currently 4/08 regexp based...)
+           */
+          void
+          check_countPraed ()
+            {
+              for (uint i=1; i <= 30; ++i)
+                  ASSERT ( i == countPraed (garbage_query (i)));
+            }
+        };
+      
+      
+      /** Register this test class... */
+      LAUNCHER (QueryUtils_test, "unit query");
+      
+      
+      
+    } // namespace test
+    
+  } // namespace query
+
+} // namespace lumiera
diff --git a/tests/components/common/sanitizedidentifiertest.cpp b/tests/components/common/sanitizedidentifiertest.cpp
index 416d81c58..1e96bc515 100644
--- a/tests/components/common/sanitizedidentifiertest.cpp
+++ b/tests/components/common/sanitizedidentifiertest.cpp
@@ -45,8 +45,8 @@ namespace util
             print_clean ("trailing Withespace\n       \t");
             print_clean ("with    a  \t lot\n  of Whitespace");
             print_clean ("with\"much (punctuation)[]!");
-            print_clean ("§&Ω%€  leading garbarge");
-            print_clean ("mixed    Ω   garbarge");
+            print_clean ("§&Ω%€  leading garbage");
+            print_clean ("mixed    Ω   garbage");
             print_clean ("Bääääh!!");
             print_clean ("§&Ω%€");
           }
diff --git a/tests/components/proc/mobject/session/defsregistryimpltest.cpp b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
index 3bdc8f1f2..fa5d2c4c3 100644
--- a/tests/components/proc/mobject/session/defsregistryimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
@@ -28,12 +28,15 @@
 #include "common/factory.hpp"
 #include "common/query.hpp"
 
+#include "common/query/querydiagnostics.hpp"
+
 #include <boost/scoped_ptr.hpp>
 #include <boost/format.hpp>
 #include <cstdlib>
 #include <map>
 
 using lumiera::Query;
+using lumiera::query::test::garbage_query;
 using util::isnil;
 
 using std::tr1::shared_ptr;
@@ -52,13 +55,10 @@ namespace mobject
     namespace test
       {
       
-      const uint MAX_DEGREE_RAND = 9;
-      
       format typePatt ("Dummy<%2i>");
       format instancePatt ("obj_%s_%i");
       format predicatePatt ("%s_%2i( %s )");
       
-      const string garbage ("asdfghjklqwertzuiop");
       
       
       /** create a random new ID */
@@ -85,27 +85,6 @@ namespace mobject
       
       
       
-      string
-      garbage_term ()         ///< yields a random string of 3 letters
-      {
-        return str (predicatePatt 
-                   % char ('a'+ rand() % 26)
-                   % (rand() % 100)
-                   % garbage.substr(rand() % 17 , 3)
-                   );
-      }
-      
-      string
-      q_str (int degree=0)    ///< fabricating (random) query strings
-      {
-        string fake;
-        if (!degree) 
-          degree = 1 + rand() % MAX_DEGREE_RAND;
-        while (0 < --degree)
-          fake += garbage_term() + ", ";
-        fake += garbage_term() + ".";
-        return fake;
-      }
       
       
       
@@ -141,11 +120,11 @@ namespace mobject
         public:
           DefsRegistryImpl_test ()
             : o1 (oFac()), o2 (oFac()), o3 (oFac()), 
-              q1 (q_str (1)),
-              q2 (q_str (2)),
-              q3 (q_str (3)),
-              q4 (q_str (4)),
-              q5 (q_str (5))
+              q1 (garbage_query (1)),
+              q2 (garbage_query (2)),
+              q3 (garbage_query (3)),
+              q4 (garbage_query (4)),
+              q5 (garbage_query (5))
             { }
           
           
@@ -178,7 +157,7 @@ namespace mobject
               for (int i=0; i<100; ++i)
                 {
                   P px (pFac());
-                  Q23 qx (q_str());
+                  Q23 qx (garbage_query());
                   ps[qx] = px;
                   reg_->put (px, qx);
                   px->instanceID = qx;

From b53d8655fd334a292cb686f22276259a8c36fa7f Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 6 Apr 2008 08:56:18 +0200
Subject: [PATCH 21/36] yet another helper function: remove matching term from
 query string

---
 src/common/query.cpp                          | 38 +++++++++++++++----
 src/common/query.hpp                          |  8 +++-
 tests/52query.tests                           |  5 +++
 .../common/query/querydiagnostics.hpp         | 11 +-----
 .../common/query/queryutilstest.cpp           | 29 +++++++++++++-
 5 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/src/common/query.cpp b/src/common/query.cpp
index d7fb51257..67873a5e8 100644
--- a/src/common/query.cpp
+++ b/src/common/query.cpp
@@ -77,8 +77,16 @@ namespace lumiera
       {
       map<Symbol, regex> regexTable;
       
-      Symbol matchArgument = "\\(\\s*([\\w_\\.\\-]+)\\s*\\)"; 
+      Symbol matchArgument = "\\(\\s*([\\w_\\.\\-]+)\\s*\\),?\\s*"; 
       regex findPredicate (string("(\\w+)")+matchArgument);
+      
+      inline regex&
+      getTermRegex (Symbol sym)
+      {
+        if (!contains (regexTable, sym))
+          regexTable[sym] = regex (string(sym)+=matchArgument);
+        return regexTable[sym];
+      }
     }
     
     /** (preliminary) helper: instead of really parsing and evaluating the terms,
@@ -90,17 +98,31 @@ namespace lumiera
     const string
     extractID (Symbol sym, const string& termString)
     {
-      
-      if (!contains (regexTable, sym))
-        regexTable[sym] = regex (string(sym)+=matchArgument); 
-      
       smatch match;
-      if (regex_search (termString, match, regexTable[sym]))
-        return string (match[1]);
+      if (regex_search (termString, match, getTermRegex (sym)))
+        return (match[1]);
       else
         return "";
+    } 
     
-  } 
+    
+    /** (preliminary) helper: cut a term with the given symbol. 
+     *  The term is matched, removed from the original string and returned
+     *  @note parameter termString will be modified!
+     */
+    const string
+    removeTerm (Symbol sym, string& termString)
+    {
+      smatch match;
+      if (regex_search (termString, match, getTermRegex (sym)))
+        {
+          string res (sym); res += "("+match[1]+")";
+          termString.erase (match.position(), match[0].length());
+          return res;
+        }
+      else
+        return "";
+    } 
   
     
     /** @note this is a very hackish preliminary implementation. 
diff --git a/src/common/query.hpp b/src/common/query.hpp
index b7d22498b..14d23982b 100644
--- a/src/common/query.hpp
+++ b/src/common/query.hpp
@@ -69,7 +69,6 @@ namespace lumiera
      */
     void normalizeID (string& id);
     
-    const string extractID (Symbol, const string& termString);
 
     /** count the top-level predicates in the query string.
      *  usable for ordering queries, as more predicates usually
@@ -77,7 +76,12 @@ namespace lumiera
      */
     uint countPraed (const string&);
     
-  
+    
+    const string extractID (Symbol, const string& termString);
+    
+    const string removeTerm (Symbol, string& termString);
+
+    
   } // namespace query
     
 } // namespace lumiera
diff --git a/tests/52query.tests b/tests/52query.tests
index ce5f4f31e..2c598b3b0 100644
--- a/tests/52query.tests
+++ b/tests/52query.tests
@@ -18,6 +18,11 @@ return: 0
 END
 
 
+TEST "QueryUtils_test" QueryUtils_test  removeTerm  <<END
+return: 0
+END
+
+
 TEST "QueryUtils_test" QueryUtils_test  countPraed  <<END
 return: 0
 END
diff --git a/tests/components/common/query/querydiagnostics.hpp b/tests/components/common/query/querydiagnostics.hpp
index 91bcbebbc..54545d841 100644
--- a/tests/components/common/query/querydiagnostics.hpp
+++ b/tests/components/common/query/querydiagnostics.hpp
@@ -1,5 +1,5 @@
 /*
-  QUERYDIAGNOSTICS.hpp  -  herlpers for writing tests covering config queries
+  QUERYDIAGNOSTICS.hpp  -  helpers for writing tests covering config queries
  
   Copyright (C)         Lumiera.org
     2008,               Hermann Vosseler <Ichthyostega@web.de>
@@ -25,20 +25,11 @@
 #define LUMIERA_TEST_QUERY_QUERYDIAGNOSTICS_H
 
 
-//#include "common/factory.hpp"
-//#include "common/util.hpp"
-
-//#include <boost/algorithm/string.hpp>
-//#include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
-//#include <iostream>
 #include <cstdlib>
 
-//using boost::algorithm::join;
-//using boost::lexical_cast;
 using boost::format;
 using std::string;
-//using std::cout;
 using std::rand;
 
 
diff --git a/tests/components/common/query/queryutilstest.cpp b/tests/components/common/query/queryutilstest.cpp
index 6a5b7f375..05cfab7ef 100644
--- a/tests/components/common/query/queryutilstest.cpp
+++ b/tests/components/common/query/queryutilstest.cpp
@@ -68,11 +68,12 @@ namespace lumiera
           virtual void
           run (Arg arg) 
             {
-              if (isnil(arg))  arg = Cmdline ("Query normalizeID extractID countPraed");
+              if (isnil(arg))  arg = Cmdline ("Query normalizeID extractID removeTerm countPraed");
               
               if (contains (arg, "Query"      ))   check_Query ();
               if (contains (arg, "normalizeID"))   check_normalizeID ();
               if (contains (arg, "extractID"  ))   check_extractID ();
+              if (contains (arg, "removeTerm" ))   check_removeTerm ();
               if (contains (arg, "countPraed" ))   check_countPraed ();
             }
           
@@ -122,6 +123,32 @@ namespace lumiera
           
           
           
+          /** @test the regexp based cutting of a term with given symbol */
+          void
+          check_removeTerm ()
+            {
+              // successfull-----Symbol---input-string----------------------extracted------remaining-------------
+              ASSERT_removeTerm ("pred", "pred(tok).",                     "pred(tok)",   "."                    );
+              ASSERT_removeTerm ("pred", "    pred( tok )",                "pred(tok)",   "    "                 );
+              ASSERT_removeTerm ("pred", "pred(tok), pred(tux).",          "pred(tok)",   "pred(tux)."           );
+              ASSERT_removeTerm ("pred", "other(xyz) pred(tok) pred(tux)", "pred(tok)",   "other(xyz) pred(tux)" );
+              ASSERT_removeTerm ("pred", "some( pred(tok)",                "pred(tok)",   "some( "               );
+              
+              // not successfull
+              ASSERT_removeTerm ("pred", "pred (tok",                      "",            "pred (tok" );
+              ASSERT_removeTerm ("pred", "pred tok)",                      "",            "pred tok)" );
+              ASSERT_removeTerm ("pred", "pred(tok",                       "",            "pred(tok"  );
+            }
+          
+          void
+          ASSERT_removeTerm (Symbol sym, string input, Symbol extracted, Symbol modified)
+            {
+              ASSERT (extracted == removeTerm (sym, input));
+              ASSERT (modified  == input);
+            }
+          
+          
+          
           /** @test counting of predicates in a quiery
            *  (currently 4/08 regexp based...)
            */

From 3ed3813be38fb58e29b143a90a55ac809da07189 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 6 Apr 2008 20:11:34 +0200
Subject: [PATCH 22/36] WIP work out how some special cases of config queries
 can be handled. Including some tricky recursive calls. Even if this is
 currently a mock implementation it helps me find out how the real
 implementation (in Prolog) could handle these cases. Doesnt pass the compiler
 yet (some stubs missing)

---
 src/common/query/mockconfigrules.cpp | 35 ++++++++++---
 src/common/query/mockconfigrules.hpp | 73 ++++++++++++++++++++++++++--
 src/proc/asset/structfactoryimpl.hpp |  2 +-
 wiki/renderengine.html               |  4 +-
 4 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp
index 6a4303cd0..d688d9dbd 100644
--- a/src/common/query/mockconfigrules.cpp
+++ b/src/common/query/mockconfigrules.cpp
@@ -28,9 +28,10 @@
 #include "proc/asset/pipe.hpp"
 
 
-//#include "common/util.hpp"
+#include "common/util.hpp"
 #include "nobugcfg.h"
 
+using util::isnil;
 
 
 namespace lumiera
@@ -101,9 +102,33 @@ namespace lumiera
       item<Pipe> (answer_, "pipe(default)")   = item<Pipe>(answer_,"pipe(master), stream(video)"); //TODO killme
       TODO ("remove the default entries!!!  DefaultsManager should find them automatically");
     }
+    
+    
+    /* under some circumstances we need to emulate the behaviour *
+     * of a real resolution engine in a more detailed manner.    *
+     * These case are hard wired in code below                   */
+    
+    /** special case: create a new pipe with matching pipe and stream IDs on the fly when referred... */
+    bool 
+    MockTable::fabricate_matching_new_Pipe (Query<Pipe>& q, string const& pipeID, string const& streamID)
+    {
+      answer_->insert (entry<Pipe> (q, Struct::create (pipeID, streamID)));
+    }
+    /** special case: create/retrieve new rocessing pattern for given stream ID... */
+    bool 
+    MockTable::fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID)
+    {
+      typedef const ProcPatt cPP;
+      typedef typename WrapReturn<cPP>::Wrapper Ptr;
+      
+      Ptr newPP (Struct::create (Query<cPP> ("make(PP), "+q)));
+      answer_->insert (entry<cPP> (q, newPP));
+    }
+    
 
     
     
+    
     MockConfigRules::MockConfigRules () 
     {
       WARN (config, "using a mock implementation of the ConfigQuery interface");
@@ -123,8 +148,8 @@ namespace lumiera
      *  and with capabilities or properties defined by
      *  the query. The real implementation would require
      *  a rule based system (Ichthyo plans to use YAP Prolog),
-     *  while this dummy implementation simply relies on a
-     *  table of pre-fabricated objects. Never fails.
+     *  while this dummy implementation simply relpies based
+     *  on a table of pre-fabricated objects. Never fails.
      *  @return smart ptr (or similar) holding the object,
      *          maybe an empty smart ptr if not found
      */
@@ -144,9 +169,5 @@ namespace lumiera
 
   
   } // namespace query
-    
-  
-  /** */
-
 
 } // namespace lumiera
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index f01d3268d..3ff5d1cff 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -38,6 +38,7 @@
 #ifndef LUMIERA_MOCKCONFIGRULES_H
 #define LUMIERA_MOCKCONFIGRULES_H
 
+#include "proc/mobject/session.hpp"
 #include "common/configrules.hpp"
 #include "common/util.hpp"
 
@@ -54,8 +55,10 @@ namespace lumiera
   
   namespace query
     {
+    using asset::Pipe;
     using asset::ProcPatt;
     using asset::PProcPatt;
+    using mobject::Session;
     
     using util::isnil;
     
@@ -88,6 +91,11 @@ namespace lumiera
         MockTable ();
         const any& fetch_from_table_for (const string& queryStr);
         
+        // special cases....
+        bool fabricate_matching_new_Pipe (Query<Pipe>& q, string const& pipeID, string const& streamID);
+        bool fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID);
+
+        
       private:
         void fill_mock_table ();
       };
@@ -117,14 +125,73 @@ namespace lumiera
                    )
                   return solution = candidate;
               }
-            
-            return solution = Ret();    // fail: return default-constructed empty smart ptr
+            return try_special_case(solution, q);
           }
+      
+      private:
+        bool
+        try_special_case (Ret& solution, const Query<TY>& q)
+          {
+            Query<TY> newQuery = q;
+            if (is_defaults_query (q))  // modified query..
+              return solution = Session::current->defaults (newQuery);
+                                      //   may cause recursion
+            if (detect_case (newQuery))
+              return resolve (solution, newQuery);
+            
+            return solution = Ret();  
+                                // fail: return default-constructed empty smart ptr
+          }
+        
+        bool
+        detect_case (Query<TY>& q);
       };
     
     
+    /** Hook for treating very special cases for individual types only */
+    template<class TY, class BASE>
+    inline bool 
+    LookupPreconfigured<TY,BASE>::detect_case (Query<TY>& q)
+    {
+      q.clear(); // end recursion
+      return false;
+    }
+    template<class BASE>
+    inline bool 
+    LookupPreconfigured<Pipe,BASE>::detect_case (Query<Pipe>& q)
+    {
+      const string pipeID   = extractID("pipe", q);
+      const string streamID = extractID("stream", q);
+      if (!isnil(pipeID) && !isnil(streamID))
+          return fabricate_matching_new_Pipe (q, pipeID, streamID);
+      
+      q.clear();
+      return false;
+    }
+    template<>
+    inline bool 
+    LookupPreconfigured<const ProcPatt>::detect_case (Query<const ProcPatt>& q)
+    {
+      const string streamID = extractID("stream", q);
+      if (!isnil(streamID))
+          return fabricate_ProcPatt_on_demand (q, streamID);
+      
+      // note: we don't handle the case of "make(PP), capabilities....." specially
+      // because either someone puts a special object into the mock table, or the
+      // recursive query done by the StructFactory simply fails, resulting in
+      // the StructFactory issuing a ProcPatt ctor call.
+      
+      q.clear();
+      return false;
+    }
+    
+    
+    
+    
+    
+    
     /** 
-     * Dummy Implementation of the query interface.
+     * Facade: Dummy Implementation of the query interface.
      * Provides an explicit implementation using hard wired
      * values for some types of interest for testing and debugging.
      */
diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp
index fb8e5245f..c2f6f2ab7 100644
--- a/src/proc/asset/structfactoryimpl.hpp
+++ b/src/proc/asset/structfactoryimpl.hpp
@@ -149,7 +149,7 @@ namespace asset
     StructFactoryImpl::fabricate (const Query<Track>& caps)
       {
         TODO ("actually extract properties/capabilities from the query...");
-        TODO ("make sure AssetManager detects dublicates (it doesn't currently)");
+        TODO ("make sure AssetManager detects dublicates (currently 4/08 it doesn't)");
         return new Track (createIdent (caps));
       }
     
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 5523b8c60..6d764e90b 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -2267,12 +2267,12 @@ The GUI can connect the viewer(s) to some pipe (and moreover can use [[probe poi
 
 </pre>
 </div>
-<div title="PipeHandling" modifier="Ichthyostega" modified="200801121656" created="200801101352" tags="spec" changecount="9">
+<div title="PipeHandling" modifier="Ichthyostega" modified="200804061705" created="200801101352" tags="spec" changecount="10">
 <pre>!Identification
 Pipes are distinct objects and can be identified by their asset ~IDs. Besides, as for all [[structural assets|StructAsset]] there are extended query capabilities, including a symbolic pipe-id and a media (stream) type id. Any pipe can accept and deliver exactly one media stream kind (which may be inherently structured though, e.g. spatial sound systems or stereoscopic video)
 
 !creating pipes
-Pipe assets are created automatically by being used and referred. The [[Session]] holds a collection of global pipes, and further pipes can be created by using an new pipe reference in some placement. Moreover, every clip has an (implicit) [[source port|ClipSourcePort]], which will appear as pipe asset when first used (referred) while [[building|BuildProcess]].
+Pipe assets are created automatically by being used and referred. The [[Session]] holds a collection of global pipes, and further pipes can be created by using a new pipe reference in some placement. Moreover, every clip has an (implicit) [[source port|ClipSourcePort]], which will appear as pipe asset when first used (referred) while [[building|BuildProcess]]. Note that creating a new pipe implies using a [[processing pattern|ProcPatt]], which will be queried from the [[Defaults Manager|DefaultsManagement]] (resulting in the use of some preconfigured pattern or maybe the creation of a new ProcPatt object if necessary)
 
 !removal
 Deleting a Pipe is an advanced operation, because it includes finding and &quot;detaching&quot; all references, otherwise the pipe will leap back into existence immediately. Thus, global pipe entries in the Session and pipe references in [[locating pins|LocatingPin]] within any placement have to be removed, while clips using a given source port will be disabled. {{red{todo: implementation deferred}}}

From b86a8605e7ce69dfd320720551922954dfc1a8ef Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 7 Apr 2008 03:19:24 +0200
Subject: [PATCH 23/36] now complete and passing the compiler

---
 src/common/query.hpp                        |  5 ++-
 src/common/query/mockconfigrules.cpp        | 12 +++++-
 src/common/query/mockconfigrules.hpp        | 48 +++++++++++++--------
 src/proc/mobject/session/defsmanager.cpp    | 12 +++++-
 src/proc/mobject/session/mobjectfactory.hpp |  2 +-
 src/proc/mobject/session/track.hpp          |  8 +++-
 6 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/src/common/query.hpp b/src/common/query.hpp
index 14d23982b..db76259db 100644
--- a/src/common/query.hpp
+++ b/src/common/query.hpp
@@ -52,12 +52,13 @@ namespace lumiera
       explicit Query (const string& predicate="") : string(predicate) {}
       explicit Query (format& pattern)            : string(str(pattern)) {}
       
-      
       const string asKey()  const
         {
           return string(typeid(OBJ).name())+": "+*this;
         }
-    };
+      
+      operator string& () { return *this; }      // TODO: needed temporarily by mockconfigrules
+    };                                          //        for calling removeTerm on the string-ref....
 
     
   namespace query
diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp
index d688d9dbd..7589d84f7 100644
--- a/src/common/query/mockconfigrules.cpp
+++ b/src/common/query/mockconfigrules.cpp
@@ -93,6 +93,7 @@ namespace lumiera
       
       typedef const ProcPatt cPP;
       
+      
       // for baiscpipetest.cpp ---------
       answer_->insert (entry_Struct<cPP> ("stream(video)"));
       answer_->insert (entry_Struct<cPP> ("stream(teststream)"));
@@ -104,6 +105,8 @@ namespace lumiera
     }
     
     
+    
+    
     /* under some circumstances we need to emulate the behaviour *
      * of a real resolution engine in a more detailed manner.    *
      * These case are hard wired in code below                   */
@@ -112,17 +115,22 @@ namespace lumiera
     bool 
     MockTable::fabricate_matching_new_Pipe (Query<Pipe>& q, string const& pipeID, string const& streamID)
     {
-      answer_->insert (entry<Pipe> (q, Struct::create (pipeID, streamID)));
+      typedef WrapReturn<Pipe>::Wrapper Ptr;
+      
+      Ptr newPipe (Struct::create (pipeID, streamID));
+      answer_->insert (entry<Pipe> (q, newPipe));
+      return true; // denotes query will now succeed...
     }
     /** special case: create/retrieve new rocessing pattern for given stream ID... */
     bool 
     MockTable::fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID)
     {
       typedef const ProcPatt cPP;
-      typedef typename WrapReturn<cPP>::Wrapper Ptr;
+      typedef WrapReturn<cPP>::Wrapper Ptr;
       
       Ptr newPP (Struct::create (Query<cPP> ("make(PP), "+q)));
       answer_->insert (entry<cPP> (q, newPP));
+      return true;
     }
     
 
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index 3ff5d1cff..c3f6684ca 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -67,12 +67,28 @@ namespace lumiera
     
     
     
-    /** a traits-class to define the smart-ptr to wrap the result */
-    template<class TY>
-    struct WrapReturn             { typedef shared_ptr<TY> Wrapper;  };
     
-    template<>
-    struct WrapReturn<ProcPatt>   { typedef PProcPatt Wrapper;  };
+    
+    namespace // internal details
+      {
+      
+      /** a traits-class to define the smart-ptr to wrap the result */
+      template<class TY>
+      struct WrapReturn             { typedef shared_ptr<TY> Wrapper;  };
+      
+      template<>
+      struct WrapReturn<ProcPatt>   { typedef PProcPatt Wrapper;  };
+      
+      
+      /** helper detecting if a query actually intended to retrieve a "default" object.
+       *  This implementation is quite crude, of cours it would be necessary to actually
+       *  parse and evaluate the query. @note query is modified if "default" ... */
+      inline bool
+      is_defaults_query (string& query)
+      {
+        return !isnil (removeTerm ("default", query));
+      }
+    } // details (end)
     
     
     /** 
@@ -92,6 +108,8 @@ namespace lumiera
         const any& fetch_from_table_for (const string& queryStr);
         
         // special cases....
+        template<class TY> 
+        bool detect_case (Query<TY>& q);
         bool fabricate_matching_new_Pipe (Query<Pipe>& q, string const& pipeID, string const& streamID);
         bool fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID);
 
@@ -133,32 +151,28 @@ namespace lumiera
         try_special_case (Ret& solution, const Query<TY>& q)
           {
             Query<TY> newQuery = q;
-            if (is_defaults_query (q))  // modified query..
+            if (is_defaults_query (newQuery))  // modified query..
               return solution = Session::current->defaults (newQuery);
-                                      //   may cause recursion
+                                             //   may cause recursion
             if (detect_case (newQuery))
               return resolve (solution, newQuery);
             
-            return solution = Ret();  
-                                // fail: return default-constructed empty smart ptr
+            return solution = Ret();     // fail: return default-constructed empty smart ptr
           }
-        
-        bool
-        detect_case (Query<TY>& q);
       };
     
     
     /** Hook for treating very special cases for individual types only */
-    template<class TY, class BASE>
+    template<class TY>
     inline bool 
-    LookupPreconfigured<TY,BASE>::detect_case (Query<TY>& q)
+    MockTable::detect_case (Query<TY>& q)
     {
       q.clear(); // end recursion
       return false;
     }
-    template<class BASE>
+    template<>
     inline bool 
-    LookupPreconfigured<Pipe,BASE>::detect_case (Query<Pipe>& q)
+    MockTable::detect_case (Query<Pipe>& q)
     {
       const string pipeID   = extractID("pipe", q);
       const string streamID = extractID("stream", q);
@@ -170,7 +184,7 @@ namespace lumiera
     }
     template<>
     inline bool 
-    LookupPreconfigured<const ProcPatt>::detect_case (Query<const ProcPatt>& q)
+    MockTable::detect_case (Query<const ProcPatt>& q)
     {
       const string streamID = extractID("stream", q);
       if (!isnil(streamID))
diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp
index 4c5cd9f82..1d6f92e9a 100644
--- a/src/proc/mobject/session/defsmanager.cpp
+++ b/src/proc/mobject/session/defsmanager.cpp
@@ -134,6 +134,8 @@ namespace mobject
 
 #include "proc/asset/procpatt.hpp"
 #include "proc/asset/pipe.hpp"
+#include "proc/asset/track.hpp"
+#include "proc/mobject/session/track.hpp"
 
 namespace mobject
   {
@@ -145,9 +147,15 @@ namespace mobject
     using asset::ProcPatt;
     using asset::PProcPatt;
     
+    using mobject::session::Track;
+    using mobject::session::TrackAsset;
+    using mobject::session::PTrack;
+    using mobject::session::PTrackAsset;
     
-    template PPipe     DefsManager::operator() (const Query<Pipe>&); 
-    template PProcPatt DefsManager::operator() (const Query<const ProcPatt>&); 
+    template PPipe       DefsManager::operator() (const Query<Pipe>&); 
+    template PProcPatt   DefsManager::operator() (const Query<const ProcPatt>&); 
+    template PTrack      DefsManager::operator() (const Query<Track>&); 
+    template PTrackAsset DefsManager::operator() (const Query<TrackAsset>&); 
     
     template bool DefsManager::define (const PPipe&, const Query<Pipe>&);
     template bool DefsManager::forget (const PPipe&);
diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp
index 02a0f52b3..cff884ca7 100644
--- a/src/proc/mobject/session/mobjectfactory.hpp
+++ b/src/proc/mobject/session/mobjectfactory.hpp
@@ -45,7 +45,7 @@ namespace mobject
     class Track;
     class Effect;
     
-    typedef shared_ptr<const asset::Track> PTrackAsset;
+    typedef shared_ptr<asset::Track> PTrackAsset;
 
 
     class MObjectFactory
diff --git a/src/proc/mobject/session/track.hpp b/src/proc/mobject/session/track.hpp
index 3a5517d52..d4005b97d 100644
--- a/src/proc/mobject/session/track.hpp
+++ b/src/proc/mobject/session/track.hpp
@@ -34,7 +34,11 @@ namespace mobject
   {
   namespace session
     {
-    typedef shared_ptr<const asset::Track> PTrackAsset;
+    class Track;
+    typedef asset::Track TrackAsset;
+    
+    typedef shared_ptr<Track> PTrack;
+    typedef shared_ptr<TrackAsset> PTrackAsset;
 
 
     /**
@@ -57,7 +61,7 @@ namespace mobject
 
       public:
         /** Child tracks in a tree structure */
-        vector<Placement<Track> > subTracks;  // TODO: Placement!!!!!!!
+        vector<Placement<Track> > subTracks;  ////TODO: it should really work with Placements! this here is just a decoy!!!!!!!
         
         virtual bool isValid()  const;
       };

From dfefbea769cb1b45284df71af67dc151a0bf37b7 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 7 Apr 2008 05:11:09 +0200
Subject: [PATCH 24/36] overdue to write down some documentation about
 ConfigRules (starting to loose track of some relations myself...)

---
 doc/devel/uml/class139653.html           |   3 +-
 doc/devel/uml/class140549.html           |  26 ++
 doc/devel/uml/class140677.html           |  27 ++
 doc/devel/uml/class140805.html           |  26 ++
 doc/devel/uml/class140933.html           |  24 +
 doc/devel/uml/class141061.html           |  22 +
 doc/devel/uml/class141189.html           |  31 ++
 doc/devel/uml/class141317.html           |  24 +
 doc/devel/uml/class141445.html           |  23 +
 doc/devel/uml/class141573.html           |  23 +
 doc/devel/uml/class141701.html           |  20 +
 doc/devel/uml/class141829.html           |  20 +
 doc/devel/uml/classdiagrams.html         |   1 +
 doc/devel/uml/classes.html               |  11 +
 doc/devel/uml/classes_list.html          |  11 +
 doc/devel/uml/collaborationdiagrams.html |   1 +
 doc/devel/uml/componentdiagrams.html     |   1 +
 doc/devel/uml/fig131461.png              | Bin 0 -> 49580 bytes
 doc/devel/uml/fig131589.png              | Bin 0 -> 12406 bytes
 doc/devel/uml/fig131717.png              | Bin 0 -> 14266 bytes
 doc/devel/uml/fig131845.png              | Bin 0 -> 18298 bytes
 doc/devel/uml/index.html                 |  73 ++-
 doc/devel/uml/index_34.html              |  23 +
 doc/devel/uml/index_60.html              |   2 +-
 doc/devel/uml/index_65.html              |   3 +-
 doc/devel/uml/index_67.html              |  42 +-
 doc/devel/uml/index_68.html              |   6 +-
 doc/devel/uml/index_69.html              |   2 +-
 doc/devel/uml/index_70.html              |   3 +-
 doc/devel/uml/index_72.html              |   2 +-
 doc/devel/uml/index_73.html              |   2 +-
 doc/devel/uml/index_76.html              |   1 +
 doc/devel/uml/index_77.html              |   1 +
 doc/devel/uml/index_78.html              |   1 +
 doc/devel/uml/index_79.html              |   2 +-
 doc/devel/uml/index_80.html              |   1 +
 doc/devel/uml/index_81.html              |  27 ++
 doc/devel/uml/index_82.html              |   8 +-
 doc/devel/uml/index_83.html              |   3 +-
 doc/devel/uml/index_84.html              |   8 +-
 doc/devel/uml/index_85.html              |   2 +
 doc/devel/uml/index_86.html              |  14 +-
 doc/devel/uml/index_87.html              |   1 +
 doc/devel/uml/index_89.html              |  23 +
 doc/devel/uml/navig.html                 |   2 +-
 doc/devel/uml/packages.html              |   1 +
 doc/devel/uml/public_operations.html     |   8 +-
 doc/devel/uml/usecasediagrams.html       |   1 +
 doc/devel/uml/usecases.html              |   6 +
 uml/lumiera/128261                       |  11 +-
 uml/lumiera/128517                       |   4 +-
 uml/lumiera/129285                       |   2 +-
 uml/lumiera/131077                       | 551 +++++++++++++++++++++++
 uml/lumiera/131461.diagram               | 196 ++++++++
 uml/lumiera/131589.diagram               |  21 +
 uml/lumiera/131717.diagram               |  45 ++
 uml/lumiera/131845.diagram               |  68 +++
 uml/lumiera/5.session                    |  44 +-
 uml/lumiera/lumiera.prj                  |   4 +-
 wiki/renderengine.html                   |  35 +-
 60 files changed, 1466 insertions(+), 77 deletions(-)
 create mode 100644 doc/devel/uml/class140549.html
 create mode 100644 doc/devel/uml/class140677.html
 create mode 100644 doc/devel/uml/class140805.html
 create mode 100644 doc/devel/uml/class140933.html
 create mode 100644 doc/devel/uml/class141061.html
 create mode 100644 doc/devel/uml/class141189.html
 create mode 100644 doc/devel/uml/class141317.html
 create mode 100644 doc/devel/uml/class141445.html
 create mode 100644 doc/devel/uml/class141573.html
 create mode 100644 doc/devel/uml/class141701.html
 create mode 100644 doc/devel/uml/class141829.html
 create mode 100644 doc/devel/uml/fig131461.png
 create mode 100644 doc/devel/uml/fig131589.png
 create mode 100644 doc/devel/uml/fig131717.png
 create mode 100644 doc/devel/uml/fig131845.png
 create mode 100644 doc/devel/uml/index_34.html
 create mode 100644 doc/devel/uml/index_81.html
 create mode 100644 doc/devel/uml/index_89.html
 create mode 100644 uml/lumiera/131077
 create mode 100644 uml/lumiera/131461.diagram
 create mode 100644 uml/lumiera/131589.diagram
 create mode 100644 uml/lumiera/131717.diagram
 create mode 100644 uml/lumiera/131845.diagram

diff --git a/doc/devel/uml/class139653.html b/doc/devel/uml/class139653.html
index cfdc8392a..641046544 100644
--- a/doc/devel/uml/class139653.html
+++ b/doc/devel/uml/class139653.html
@@ -21,7 +21,8 @@
 <a name="refoperation133509"></a>
 <table><tr><td><div class="element">Operation <b>currEDL</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : + currEDL() : <a href="class128133.html#refclass128133"><b>EDL</b></a></li><li>C++ : public: <a href="class128133.html#refclass128133"><b>EDL</b></a> currEDL () </li></ul><p>The EDL currently in focus. In most cases, Session and EDL are almost the same, just EDL emphasizes the collection aspect. But generally (for larger editing projects) one Session can contain several EDLs, which may even be nested. At any given time, only one of these EDLs has focus and recieves the editing commands.<br /></p><a name="refoperation133637"></a>
 <table><tr><td><div class="element">Operation <b>getFixture</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : + getFixture() : Fixture&amp;</li><li>C++ : public: Fixture&amp; getFixture () </li></ul><p>While the session can be comprised of several EDLs, <br />there is only one Fixture, which represents the actual<br />configuration of all Objects to be rendered<br /></p><a name="refrelation144773"></a>
-<table><tr><td><div class="element">Relation <b>current (&lt;unidirectional association&gt;)</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : static, + current : <a href="class139781.html#refclass139781"><b>SessManager</b></a>, multiplicity : 1</li><li>C++ : public: static <a href="class139781.html#refclass139781"><b>SessManager</b></a>&amp; current</li></ul><p>Standard access path to get at the current session via the Session Manager, which acts as a "PImpl" smart pointer<br /></p></div>
+<table><tr><td><div class="element">Relation <b>current (&lt;unidirectional association&gt;)</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : static, + current : <a href="class139781.html#refclass139781"><b>SessManager</b></a>, multiplicity : 1</li><li>C++ : public: static <a href="class139781.html#refclass139781"><b>SessManager</b></a>&amp; current</li></ul><p>Standard access path to get at the current session via the Session Manager, which acts as a "PImpl" smart pointer<br /></p><a name="refrelation150917"></a>
+<table><tr><td><div class="element">Relation <b>defaults (&lt;unidirectional association&gt;)</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : # defaults : <a href="class141445.html#refclass141445"><b>DefaultsManager</b></a></li><li>C++ : protected: <a href="class141445.html#refclass141445"><b>DefaultsManager</b></a>* defaults</li></ul></div>
 <p>All public operations : <a href="class139653.html#refoperation133509"><b>currEDL</b></a> , <a href="class139653.html#refoperation133637"><b>getFixture</b></a> </p>
 </body>
 </html>
diff --git a/doc/devel/uml/class140549.html b/doc/devel/uml/class140549.html
new file mode 100644
index 000000000..9366aa42a
--- /dev/null
+++ b/doc/devel/uml/class140549.html
@@ -0,0 +1,26 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class ConfigRules</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class ConfigRules</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass140549"></a>
+<p>Declaration :</p><ul><li>C++ : class ConfigRules : public <a href="class140677.html#refclass140677"><b>QueryHandler</b></a>&lt;&gt; </li><li>Java : public interface ConfigRules </li></ul><p>Directly inherited by : <a href="class140933.html#refclass140933"><b>ResolverBase</b></a> </p>
+<p>public acces point for running Config Queries<br /></p><div class="sub">
+<a name="refrelation148485"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class140677.html#refclass140677"><b>QueryHandler</b></a></li><li>C++ : protected: <a href="class140677.html#refclass140677"><b>QueryHandler</b></a>* </li></ul><a name="refrelation148741"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class140677.html#refclass140677"><b>QueryHandler</b></a></li><li>C++ : protected: <a href="class140677.html#refclass140677"><b>QueryHandler</b></a>* </li></ul></div>
+<p>All public operations : <a href="class140677.html#refoperation135301"><b>resolve</b></a> </p>
+</body>
+</html>
diff --git a/doc/devel/uml/class140677.html b/doc/devel/uml/class140677.html
new file mode 100644
index 000000000..6b32a5b25
--- /dev/null
+++ b/doc/devel/uml/class140677.html
@@ -0,0 +1,27 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class QueryHandler</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class QueryHandler</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass140677"></a>
+<p>Declaration :</p><ul><li>C++ : template&lt;class TY&gt; class QueryHandler </li><li>Java : public interface QueryHandler&lt;TY&gt; </li></ul><p>Directly inherited by : <a href="class140549.html#refclass140549"><b>ConfigRules</b></a> </p>
+<div class="sub">
+<a name="refrelation148613"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class140549.html#refclass140549"><b>ConfigRules</b></a></li><li>C++ : protected: <a href="class140549.html#refclass140549"><b>ConfigRules</b></a>* </li></ul><a name="refrelation148869"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class140549.html#refclass140549"><b>ConfigRules</b></a></li><li>C++ : protected: <a href="class140549.html#refclass140549"><b>ConfigRules</b></a>* </li></ul><a name="refoperation135301"></a>
+<table><tr><td><div class="element">Operation <b>resolve</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : + resolve(inout solution : P&lt;TY&gt;, in query : Query&lt;TY&gt;) : bool</li><li>C++ : public: bool resolve () </li></ul></div>
+<p>All public operations : <a href="class140677.html#refoperation135301"><b>resolve</b></a> </p>
+</body>
+</html>
diff --git a/doc/devel/uml/class140805.html b/doc/devel/uml/class140805.html
new file mode 100644
index 000000000..a9f18e933
--- /dev/null
+++ b/doc/devel/uml/class140805.html
@@ -0,0 +1,26 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class TypeHandler</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class TypeHandler</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass140805"></a>
+<p>Declaration :</p><ul><li>C++ : template&lt;class TY&gt; class TypeHandler </li><li>Java : public interface TypeHandler&lt;TY&gt; </li></ul><p>Directly inherited by : <a href="class141317.html#refclass141317"><b>TypeHandler&lt;Pipe&gt;</b></a> </p>
+<div class="sub">
+<a name="refoperation135045"></a>
+<table><tr><td><div class="element">Operation <b>find</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : abstract, + find(in capabilities : Pred) : TY</li><li>C++ : public: virtual TY find () = 0 </li></ul><a name="refoperation135173"></a>
+<table><tr><td><div class="element">Operation <b>make</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : abstract, + make(in capabilities : Pred) : TY</li><li>C++ : public: virtual TY make () = 0 </li></ul></div>
+<p>All public operations : <a href="class140805.html#refoperation135045"><b>find</b></a> , <a href="class140805.html#refoperation135173"><b>make</b></a> </p>
+</body>
+</html>
diff --git a/doc/devel/uml/class140933.html b/doc/devel/uml/class140933.html
new file mode 100644
index 000000000..60883f3f2
--- /dev/null
+++ b/doc/devel/uml/class140933.html
@@ -0,0 +1,24 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class ResolverBase</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class ResolverBase</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass140933"></a>
+<p>Declaration :</p><ul><li>C++ : class ResolverBase : public <a href="class140549.html#refclass140549"><b>ConfigRules</b></a> </li></ul><p>Directly inherited by : <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a> </p>
+<div class="sub">
+</div>
+<p>All public operations : <a href="class140677.html#refoperation135301"><b>resolve</b></a> </p>
+</body>
+</html>
diff --git a/doc/devel/uml/class141061.html b/doc/devel/uml/class141061.html
new file mode 100644
index 000000000..db362df0b
--- /dev/null
+++ b/doc/devel/uml/class141061.html
@@ -0,0 +1,22 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class YAP_Prolog</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class YAP_Prolog</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141061"></a>
+<p>Declaration :</p><ul><li>C++ : class YAP_Prolog </li></ul><div class="sub">
+</div>
+</body>
+</html>
diff --git a/doc/devel/uml/class141189.html b/doc/devel/uml/class141189.html
new file mode 100644
index 000000000..ae8237f18
--- /dev/null
+++ b/doc/devel/uml/class141189.html
@@ -0,0 +1,31 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class QueryHandlerImpl</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class QueryHandlerImpl</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141189"></a>
+<p>Declaration :</p><ul><li>C++ : template&lt;class TY&gt; class QueryHandlerImpl : public <a href="class140933.html#refclass140933"><b>ResolverBase</b></a> </li></ul><div class="sub">
+<a name="refrelation149253"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a></li><li>C++ : protected: <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a>* </li></ul><a name="refrelation149381"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a></li><li>C++ : protected: <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a>* </li></ul><a name="refrelation149509"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a></li><li>C++ : protected: <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a>* </li></ul><a name="refrelation149637"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a></li><li>C++ : protected: <a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a>* </li></ul><a name="refoperation135429"></a>
+<table><tr><td><div class="element">Operation <b>resolve</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : + resolve(inout solution : P&lt;TY&gt;, in query : Query&lt;TY&gt;) : bool</li><li>C++ : public: bool resolve () </li></ul><a name="refrelation149765"></a>
+<table><tr><td><div class="element">Relation <b>&lt;unidirectional association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141061.html#refclass141061"><b>YAP_Prolog</b></a></li><li>C++ : protected: <a href="class141061.html#refclass141061"><b>YAP_Prolog</b></a>* </li></ul><a name="refrelation150149"></a>
+<table><tr><td><div class="element">Relation <b>&lt;unidirectional association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141061.html#refclass141061"><b>YAP_Prolog</b></a></li><li>C++ : protected: <a href="class141061.html#refclass141061"><b>YAP_Prolog</b></a>* </li></ul><a name="refrelation150277"></a>
+<table><tr><td><div class="element">Relation <b>&lt;unidirectional association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141061.html#refclass141061"><b>YAP_Prolog</b></a></li><li>C++ : protected: <a href="class141061.html#refclass141061"><b>YAP_Prolog</b></a>* </li></ul></div>
+<p>All public operations : <a href="class140677.html#refoperation135301"><b>resolve</b></a> , <a href="class141189.html#refoperation135429"><b>resolve</b></a> </p>
+</body>
+</html>
diff --git a/doc/devel/uml/class141317.html b/doc/devel/uml/class141317.html
new file mode 100644
index 000000000..96e49881c
--- /dev/null
+++ b/doc/devel/uml/class141317.html
@@ -0,0 +1,24 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class TypeHandler<Pipe></title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class TypeHandler&lt;Pipe&gt;</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141317"></a>
+<p>Declaration :</p><ul><li>C++ : template&lt;&gt; class TypeHandler&lt;Pipe&gt; : public <a href="class140805.html#refclass140805"><b>TypeHandler</b></a>&lt;&gt; </li></ul><div class="sub">
+<a name="refrelation149893"></a>
+<table><tr><td><div class="element">Relation <b>&lt;unidirectional association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class138117.html#refclass138117"><b>Pipe</b></a></li><li>C++ : protected: <a href="class138117.html#refclass138117"><b>Pipe</b></a>* </li></ul></div>
+<p>All public operations : <a href="class140805.html#refoperation135045"><b>find</b></a> , <a href="class140805.html#refoperation135173"><b>make</b></a> </p>
+</body>
+</html>
diff --git a/doc/devel/uml/class141445.html b/doc/devel/uml/class141445.html
new file mode 100644
index 000000000..0f69494d7
--- /dev/null
+++ b/doc/devel/uml/class141445.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class DefaultsManager</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class DefaultsManager</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141445"></a>
+<p>Declaration :</p><ul><li>C++ : class DefaultsManager </li></ul><div class="sub">
+<a name="refrelation150661"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141573.html#refclass141573"><b>DefaultsRegistry</b></a></li><li>C++ : protected: <a href="class141573.html#refclass141573"><b>DefaultsRegistry</b></a>* </li></ul></div>
+</body>
+</html>
diff --git a/doc/devel/uml/class141573.html b/doc/devel/uml/class141573.html
new file mode 100644
index 000000000..8417d6b5b
--- /dev/null
+++ b/doc/devel/uml/class141573.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class DefaultsRegistry</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class DefaultsRegistry</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141573"></a>
+<p>Declaration :</p><ul><li>C++ : class DefaultsRegistry </li></ul><div class="sub">
+<a name="refrelation150789"></a>
+<table><tr><td><div class="element">Relation <b>&lt;association&gt;</b></div></td></tr></table><p>Declaration :</p><ul><li>Uml : #  : <a href="class141445.html#refclass141445"><b>DefaultsManager</b></a></li><li>C++ : protected: <a href="class141445.html#refclass141445"><b>DefaultsManager</b></a>* </li></ul></div>
+</body>
+</html>
diff --git a/doc/devel/uml/class141701.html b/doc/devel/uml/class141701.html
new file mode 100644
index 000000000..232cf2aed
--- /dev/null
+++ b/doc/devel/uml/class141701.html
@@ -0,0 +1,20 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class User</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class User</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141701"></a>
+<p>Declaration :</p><ul><li>C++ : class User </li></ul></body>
+</html>
diff --git a/doc/devel/uml/class141829.html b/doc/devel/uml/class141829.html
new file mode 100644
index 000000000..d6c42943f
--- /dev/null
+++ b/doc/devel/uml/class141829.html
@@ -0,0 +1,20 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class Serializer</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class Serializer</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141829"></a>
+<p>Declaration :</p><ul><li>C++ : class Serializer </li></ul></body>
+</html>
diff --git a/doc/devel/uml/classdiagrams.html b/doc/devel/uml/classdiagrams.html
index 03c862119..4cf5416cc 100644
--- a/doc/devel/uml/classdiagrams.html
+++ b/doc/devel/uml/classdiagrams.html
@@ -27,6 +27,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram130437" target = "projectFrame"><b>Media-Asset Relations</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram131077" target = "projectFrame"><b>Proc-Asset Relations</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128389" target = "projectFrame"><b>Render Entities</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram131461" target = "projectFrame"><b>Rules access</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128133" target = "projectFrame"><b>Session structure</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram131205" target = "projectFrame"><b>Struct-Asset Relations</b></a></td><td></td><td></td></tr>
 </table>
diff --git a/doc/devel/uml/classes.html b/doc/devel/uml/classes.html
index d2f240eb9..23162b8f6 100644
--- a/doc/devel/uml/classes.html
+++ b/doc/devel/uml/classes.html
@@ -39,11 +39,14 @@
 <tr bgcolor=#f0f0f0><td><a href="class138501.html#refclass138501" target = "projectFrame"><b>CompoundMedia</b></a></td><td></td><td>compound of several elementary media tracks,<br />e.g. the individual media streams found in one media file</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128266.html#refclass128266" target = "projectFrame"><b>Condition</b></a></td><td></td><td>I provided a reworked Condition class in my Cinelerra2 repository</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135813.html#refclass135813" target = "projectFrame"><b>Config</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140549.html#refclass140549" target = "projectFrame"><b>ConfigRules</b></a></td><td>interface</td><td>public acces point for running Config Queries</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130821.html#refclass130821" target = "projectFrame"><b>ConManager</b></a></td><td></td><td>Connection Manager, used to build the connections between render engine nodes, if these nodes need to cooperate besides the normal "data pull" operation. Esp., the Connection Manager knows how to wire up the effect's parameters with the corresponding ParamProviders (autmation) in the Session</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130181.html#refclass130181" target = "projectFrame"><b>Constraint</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130309.html#refclass130309" target = "projectFrame"><b>ControllerFacade</b></a></td><td>boundary</td><td>Provides unified access to the Proc-Subsystem Controller. Especially, this Facade class provides the functions to get a render engine to carry out actual renderings.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138245.html#refclass138245" target = "projectFrame"><b>Dataset</b></a></td><td></td><td>meta asset describing a collection of control data</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138373.html#refclass138373" target = "projectFrame"><b>DB</b></a></td><td></td><td>Implementation of the registry holding all Asset instances known to the Asset Manager subsystem. As of 8/2007 implemented by a hashtable.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141445.html#refclass141445" target = "projectFrame"><b>DefaultsManager</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141573.html#refclass141573" target = "projectFrame"><b>DefaultsRegistry</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139141.html#refclass139141" target = "projectFrame"><b>DoAttach</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139269.html#refclass139269" target = "projectFrame"><b>DoRecurse</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128133.html#refclass128133" target = "projectFrame"><b>EDL</b></a></td><td></td><td></td></tr>
@@ -102,13 +105,17 @@
 <tr bgcolor=#f0f0f0><td><a href="class131717.html#refclass131717" target = "projectFrame"><b>ProcNode</b></a></td><td>interface</td><td>Key abstraction of the Render Engine: A Data processing Node</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138757.html#refclass138757" target = "projectFrame"><b>ProcPatt</b></a></td><td></td><td>special type of structural Asset representing information how to build some part of the render engine's processing nodes network.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class132229.html#refclass132229" target = "projectFrame"><b>Projector</b></a></td><td></td><td>Special video processing node used to scale and translate image data.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140677.html#refclass140677" target = "projectFrame"><b>QueryHandler</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141189.html#refclass141189" target = "projectFrame"><b>QueryHandlerImpl</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129413.html#refclass129413" target = "projectFrame"><b>RelativeLocation</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class133893.html#refclass133893" target = "projectFrame"><b>RelType</b></a></td><td>enum</td><td>the possible kinds of RelativePlacements</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class131333.html#refclass131333" target = "projectFrame"><b>RenderEngine</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130949.html#refclass130949" target = "projectFrame"><b>RenderState</b></a></td><td></td><td>Encapsulates the logic used to get a "current render process" in accordance to the currentyl applicable controller settings. The provided StateProxy serves to hold any mutalbe state used in the render process, so the rest of the render engine can be stateless.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140933.html#refclass140933" target = "projectFrame"><b>ResolverBase</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129205.html#refclass129205" target = "projectFrame"><b>Scheduler</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135173.html#refclass135173" target = "projectFrame"><b>Segment</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134277.html#refclass134277" target = "projectFrame"><b>SegmentationTool</b></a></td><td></td><td>Tool implementation for deriving a partitioning of the current timeline such, that each segement has a constant configuration. "Constant" means here, that any remaining changes over time can be represented by automation solely, without the need to change the node connections.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141829.html#refclass141829" target = "projectFrame"><b>Serializer</b></a></td><td>actor</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139653.html#refclass139653" target = "projectFrame"><b>Session</b></a></td><td></td><td>Primary Interface for all editing tasks.<br />The session contains defaults, all the assets being edited, and a set of EDL with the individual MObjects to be manipulated and rendered.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128005.html#refclass128005" target = "projectFrame"><b>SessionImpl</b></a></td><td></td><td>Implementation class for the Session interface</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139781.html#refclass139781" target = "projectFrame"><b>SessManager</b></a></td><td></td><td></td></tr>
@@ -126,13 +133,17 @@
 <tr bgcolor=#f0f0f0><td><a href="class137989.html#refclass137989" target = "projectFrame"><b>Track</b></a></td><td></td><td>structural asset holding the configuration of a track in the EDL</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128389.html#refclass128389" target = "projectFrame"><b>Track</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class131845.html#refclass131845" target = "projectFrame"><b>Trafo</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140805.html#refclass140805" target = "projectFrame"><b>TypeHandler</b></a></td><td>interface</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141317.html#refclass141317" target = "projectFrame"><b>TypeHandler&lt;Pipe&gt;</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class137477.html#refclass137477" target = "projectFrame"><b>Unknown</b></a></td><td></td><td>placeholder for unknown or unavailable media source</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141701.html#refclass141701" target = "projectFrame"><b>User</b></a></td><td>actor</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class133509.html#refclass133509" target = "projectFrame"><b>VFrame</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class140165.html#refclass140165" target = "projectFrame"><b>Visitable</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class132997.html#refclass132997" target = "projectFrame"><b>VRender</b></a></td><td></td><td>Representation of a Video render process. (Encapsulates the video buffers for the actual calculations)</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130053.html#refclass130053" target = "projectFrame"><b>Wish</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129162.html#refclass129162" target = "projectFrame"><b>WriteBuffer</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129034.html#refclass129034" target = "projectFrame"><b>WriteBufferPool</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141061.html#refclass141061" target = "projectFrame"><b>YAP_Prolog</b></a></td><td></td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/classes_list.html b/doc/devel/uml/classes_list.html
index 41655bf32..6f3005da9 100644
--- a/doc/devel/uml/classes_list.html
+++ b/doc/devel/uml/classes_list.html
@@ -40,11 +40,14 @@
 <a href="class138501.html#refclass138501" target = "projectFrame"><b>CompoundMedia</b></a><br />
 <a href="class128266.html#refclass128266" target = "projectFrame"><b>Condition</b></a><br />
 <a href="class135813.html#refclass135813" target = "projectFrame"><b>Config</b></a><br />
+<a href="class140549.html#refclass140549" target = "projectFrame"><b>ConfigRules</b></a><br />
 <a href="class130821.html#refclass130821" target = "projectFrame"><b>ConManager</b></a><br />
 <a href="class130181.html#refclass130181" target = "projectFrame"><b>Constraint</b></a><br />
 <a href="class130309.html#refclass130309" target = "projectFrame"><b>ControllerFacade</b></a><br />
 <a href="class138245.html#refclass138245" target = "projectFrame"><b>Dataset</b></a><br />
 <a href="class138373.html#refclass138373" target = "projectFrame"><b>DB</b></a><br />
+<a href="class141445.html#refclass141445" target = "projectFrame"><b>DefaultsManager</b></a><br />
+<a href="class141573.html#refclass141573" target = "projectFrame"><b>DefaultsRegistry</b></a><br />
 <a href="class139141.html#refclass139141" target = "projectFrame"><b>DoAttach</b></a><br />
 <a href="class139269.html#refclass139269" target = "projectFrame"><b>DoRecurse</b></a><br />
 <a href="class128133.html#refclass128133" target = "projectFrame"><b>EDL</b></a><br />
@@ -103,13 +106,17 @@
 <a href="class131717.html#refclass131717" target = "projectFrame"><b>ProcNode</b></a><br />
 <a href="class138757.html#refclass138757" target = "projectFrame"><b>ProcPatt</b></a><br />
 <a href="class132229.html#refclass132229" target = "projectFrame"><b>Projector</b></a><br />
+<a href="class140677.html#refclass140677" target = "projectFrame"><b>QueryHandler</b></a><br />
+<a href="class141189.html#refclass141189" target = "projectFrame"><b>QueryHandlerImpl</b></a><br />
 <a href="class129413.html#refclass129413" target = "projectFrame"><b>RelativeLocation</b></a><br />
 <a href="class133893.html#refclass133893" target = "projectFrame"><b>RelType</b></a><br />
 <a href="class131333.html#refclass131333" target = "projectFrame"><b>RenderEngine</b></a><br />
 <a href="class130949.html#refclass130949" target = "projectFrame"><b>RenderState</b></a><br />
+<a href="class140933.html#refclass140933" target = "projectFrame"><b>ResolverBase</b></a><br />
 <a href="class129205.html#refclass129205" target = "projectFrame"><b>Scheduler</b></a><br />
 <a href="class135173.html#refclass135173" target = "projectFrame"><b>Segment</b></a><br />
 <a href="class134277.html#refclass134277" target = "projectFrame"><b>SegmentationTool</b></a><br />
+<a href="class141829.html#refclass141829" target = "projectFrame"><b>Serializer</b></a><br />
 <a href="class139653.html#refclass139653" target = "projectFrame"><b>Session</b></a><br />
 <a href="class128005.html#refclass128005" target = "projectFrame"><b>SessionImpl</b></a><br />
 <a href="class139781.html#refclass139781" target = "projectFrame"><b>SessManager</b></a><br />
@@ -127,13 +134,17 @@
 <a href="class137989.html#refclass137989" target = "projectFrame"><b>Track</b></a><br />
 <a href="class128389.html#refclass128389" target = "projectFrame"><b>Track</b></a><br />
 <a href="class131845.html#refclass131845" target = "projectFrame"><b>Trafo</b></a><br />
+<a href="class140805.html#refclass140805" target = "projectFrame"><b>TypeHandler</b></a><br />
+<a href="class141317.html#refclass141317" target = "projectFrame"><b>TypeHandler&lt;Pipe&gt;</b></a><br />
 <a href="class137477.html#refclass137477" target = "projectFrame"><b>Unknown</b></a><br />
+<a href="class141701.html#refclass141701" target = "projectFrame"><b>User</b></a><br />
 <a href="class133509.html#refclass133509" target = "projectFrame"><b>VFrame</b></a><br />
 <a href="class140165.html#refclass140165" target = "projectFrame"><b>Visitable</b></a><br />
 <a href="class132997.html#refclass132997" target = "projectFrame"><b>VRender</b></a><br />
 <a href="class130053.html#refclass130053" target = "projectFrame"><b>Wish</b></a><br />
 <a href="class129162.html#refclass129162" target = "projectFrame"><b>WriteBuffer</b></a><br />
 <a href="class129034.html#refclass129034" target = "projectFrame"><b>WriteBufferPool</b></a><br />
+<a href="class141061.html#refclass141061" target = "projectFrame"><b>YAP_Prolog</b></a><br />
 </td>
 </tr>
 </table>
diff --git a/doc/devel/uml/collaborationdiagrams.html b/doc/devel/uml/collaborationdiagrams.html
index 37350c3f2..2d8ab627d 100644
--- a/doc/devel/uml/collaborationdiagrams.html
+++ b/doc/devel/uml/collaborationdiagrams.html
@@ -16,6 +16,7 @@
 <!-- ============================================================= -->
 
 <table>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcollaboration diagram131845" target = "projectFrame"><b>"default" object</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcollaboration diagram128517" target = "projectFrame"><b>build process</b></a></td><td></td><td>This figure shows the process of building and starting a RenderEngine</td></tr>
 </table>
 </body>
diff --git a/doc/devel/uml/componentdiagrams.html b/doc/devel/uml/componentdiagrams.html
index 967828869..46ed24795 100644
--- a/doc/devel/uml/componentdiagrams.html
+++ b/doc/devel/uml/componentdiagrams.html
@@ -17,6 +17,7 @@
 
 <table>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent diagram130693" target = "projectFrame"><b>backend-components</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent diagram131589" target = "projectFrame"><b>components</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent diagram128005" target = "projectFrame"><b>Overview</b></a></td><td></td><td>This drawing shows the top level compoents and relations</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent diagram130053" target = "projectFrame"><b>proc-components</b></a></td><td></td><td></td></tr>
 </table>
diff --git a/doc/devel/uml/fig131461.png b/doc/devel/uml/fig131461.png
new file mode 100644
index 0000000000000000000000000000000000000000..87241bcda3c02f1b0ef2c1bf09a7249f6c613e77
GIT binary patch
literal 49580
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
U4kCNw@K%Ti_f(NZvQPd07dSga4gdfE

literal 0
HcmV?d00001

diff --git a/doc/devel/uml/fig131589.png b/doc/devel/uml/fig131589.png
new file mode 100644
index 0000000000000000000000000000000000000000..14e1606022c8c02471ea2060dcc5d242f1d09322
GIT binary patch
literal 12406
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

literal 0
HcmV?d00001

diff --git a/doc/devel/uml/fig131717.png b/doc/devel/uml/fig131717.png
new file mode 100644
index 0000000000000000000000000000000000000000..b45afa0c17916fb91c682ff320f5371bf3f028ff
GIT binary patch
literal 14266
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

literal 0
HcmV?d00001

diff --git a/doc/devel/uml/fig131845.png b/doc/devel/uml/fig131845.png
new file mode 100644
index 0000000000000000000000000000000000000000..da87ab8cb6cc144b1855411468a26b56054b8e55
GIT binary patch
literal 18298
zcmd741yohr+b+IP5s(H21c{A=G=hNAZV-@Ex=UKRr8Y{5fFO+sC<sW0z$T<YTDrTt
zyZ>{a^PTfM@!c`LJO1~MaUG6xmV2+5bFMj``M%HdygTrjyd>@o@*5BY;XaiTSA?J|
zLJ)+ugn0#g!nV|+20=8?Q}M^juAkP&J++lpW<<6e9&6Z%9?_TA;<WpIOqMtEd1uCI
z6nErp*_?m;Y=+sKfw@@IVkNs=Y9%?1CXPsN2ThTwKG}m=+3+#8)=MmGECQKlXt-BR
zHjdBjMk{8=;s^<1%ea#cv()moCmcE-9nu`mKH_%Z5M!bTji8;@U&aIfFG91&hM<OP
zW#|xO_+|{W@BU+JG{`%a1_?o;vSC`Fr3}q%5JW&cM*=}_vHssZoh!h2_={LT$>vZT
zx2drHDo(wlVuuMc-**-+F8dm9G^@;N9-UjfrfD|U`Hk*DqS|EA8L6lGsa)LLlb(m;
zV`F0nxP<kBOG6h2qc%crdrQF|JJbv<Nb5N@a|XJ*3-<SsX<2n#i=9dMn3!gsEICYA
z5bxDpwum|V<2pZVztOhVR%PZW_!sp8Lv%jwZ<(1laB)@c-DHl+EG>;CAflv{!^FbD
z=@SVvh-K3%xfdmE@X8>;m%!9?vAtbZL`0-adt-IA!evwU{G(q~tj)~N5DJUpa+}Gj
ziHQjowcNhVSlgHkZgOrDSvNPgYOiw-509HSo+v63P3G2Or}#Y6(#lfJGUketWl+lM
zFD@<~J7^3db$4?UJ{WoddPoT~YIsXnho`Kj7D~bQYjjjALz#qx<RiHel<#@7od~b{
z>(hu5n@M@5@iGTSq{~WQ20A)=WKR$&$MtL1V)?@e!o$M4`ugZtIkF>II6g>8%g8XL
z&d<*iGs^en4J)UleSDVHzq{CJV_{)oZLM2m_QC7Wx1#-1_ttd%;rgf~Q%-jF+C*hV
zZ43DiPBLHf-n7Q1CS*~OS@Fox(b2bW_j20@a<nv}<)oxAadGEMFa-z*2@78Bnn;_=
z%ggKQf6jP(9f}Vyjy@&G6@N+>uIF{!*w{FKus&Mpwx1j+O&9+2r-XH0N=k}q7LOZE
zJ*UgY*as=Px}7@yvYqG8pYz#Fd=h+R|Lj@UTf)1g!#HZ+GbB15JlD`T?h?Z%gj<i5
zPESwQx+s)pnRX_o{gO)WonKsxiHy8SO3KK{xU0i+Qm0R#t*xDznK?E-js-(nkB7I-
z<Kp7t)IWIeptQVvpuhi>o7+UCdyD~@0R}iTSEpiOWks6F%FN8x!GW8<8Pea)mme}=
zZL{Y%;<+DfOhG}xl*-zss;c_&kt*#6GBz-@5m8Z5pFXWEEJVk~J~VE<>0?c1)u&8+
z!b4F+J7&BPOiN39usO*Q(W2|Quj2FlrL{G$!^T`SH)o=Jdhcb5kI&W1g}D5y{0YBm
zrw^-hZ{51JKyd}4@E^1IJ~cJ9x913#l90GwP0zy<MG&5lAmp;4T}789QAdu`ioH6A
zLnS!W-_OIqzyO26I5-rlO_V}DTF|nxTJ~qEbaZrR=BTE0FOiaLa48)J5;Hy^ms3|)
zH#cWGwz>J};X~~T=k>ki-nxi>YTx|)d|V3NB}e`Qd8F6*$<qi1yV2gBo_nd_oEvy}
zy#1G9VPWGHF2r#81b!aVU!P9#xS*kIcC8OLnWhPJsytpDZA}Xc3j+XKIJh{P4NZ{<
z32!mFEBXG1$1#_h<xswX&vjfb&8Ykz`SQ6QnwlTA*<;$~uVUb}x3>1=4V$Hyd@KbI
z?#oaT5)=fBh1Y82D?+zU$AnoyR(9{;!0T+gNiAD_dULbdsD(&+`RsUCNJwbXbr#ot
z^Hl4)&od<@;@h{GqNGz5&6Smvt*qG8cB0gDxA*q;4i6V6+POzw@9gXpyl4U^q$+AC
zD;rsaq17x*ufOJP`}GSC4{rnXPEJnl^5T4Tbv5U^{B~W1Dx`mX0Bdw@sNluZr%%C`
zHkJF)(y4_b{7+U+_E)1fu0ZNMXZ0l=xw@77RwG5p$;klIOpJ^GT&!j*eFc*Wy#ERJ
zO(7YVYf$#h-{E-G_kRr2BR<B%;I-Vl`A+0wJ5(uMzVg*>+VPI+(Zg3hT6Md$ckg20
zkaeX=YdSdBEyy~FHs6rMhgdNu1*}6U1)PmcO{pK*H#9aHw}jJ!*)Z18CRb2Lu@SdI
zgo4RvM55G7X7i3=thP@g2w@tUsmJ9vpaZPkoP(iCcNaMPO?-TOO3JK1E(Hmzdd+5Q
zd;8w*ZbaLBRaKSy;Rd~1XawI$q?^A%iREyzGP9pT+F%oBI~W)62DG*Bz{J(nQxy|L
z5Qzjk4a5rV@qD2KI~x_7E1k+<@qSUwIz3olU0<)XpO;RFvelvdZ;%qhhxEj>$>zS>
zN8hmj2|AMJP(y18ej8#O)`+8eYJg9R)6?B4lA&0{4BBP(ev|Ycq)G$qB4c6{K0W*}
z+8pvdBfXE2j_v^u4_1<FUMN9$e7u&5N`H<PpL9n4)@ojL6~H|J@&~Jfot>Sbiu~>e
zYr(-dRo9C(g%B5KX=!N-3ky$zNC@G<CCyGwU<rUur9=XRaNeBILBwqN)lSkXrI$Ia
zszw_V6A{71#LC#}@WjQ%Ehm1&DSnKIASNR->(bWJSm0}AF1CTtvWZpoN9wz~?+XiG
z6c6gIPE?-8+f=>UnQP&wJ_{dBRn4-Q`0)t*`}60|gm)!um58lV+xnDNHpj~D0{A2f
ztc_US*D@kY%gAVHX$j1dR)5IBvDv{lsSTE>goK2F!E}0(7r#k+?Ah5_mFKB_BOTFG
zW8---d?9hnGP_y-fB?zPL?J&m`~6kNa&S&~c=*iB%-o#O1_xHPuIW~tK4oX0Iq&}j
zLhs_|%Qti4q$VL}MJehzVMja|T5p`{4#K2U$wSgyHYdPNpjlwpsHW%HxY^p;DlISX
z?BF0HEBlGd_}#_x>w|a~O#4KEzGUuPm1qFeFN*WGmbz0obblNjFD8j>HxSp>)?(mO
zIl8zkiUo~Tlr~lJ_8N+dH(Z>b8gmV2<yBd9g)A(X?E1V|dGH7<@w0f-Iy``J7y*-)
z@~X<pu{M~{8nJzrP;yGj<#8v%qF58apTpuWk@IDRv)o!AjEeH|pA8LkbaZp`^V_2u
z(LDQ+Ztu5R_DnFbLHl(8l%%BzgN7hZdXpwRc00gCTcRc+At|xw&je4-QO)W$Ye%}y
zG+>2D5R;IoYHCVfP&@%m8O+rY@H{EX7h!E%;WOHM@K>yLA^~U)W*vj?Cw?c3U!NXH
ztYSa{0b>^UAriaw_#&?E?rlbeZ{EBCQ_*X%(6~(^lq%=hy}J7P!?odht2?}wLt!v6
z=k*b%`PN%yD4b<sVNp_4+*_4>`t*_O)@LNr#n5o3#A>wNrN(R;w3!p<ZcLkxk55)s
z7Op+Zqeo@s<(kY<s98TcI_eQb9>PFFBburR!iVG2)25~-Vz}Xp7b?vCWe$rt{PhWx
zmy$~98qc4@qNEQuCp(e!Yc*gq#iJHxjcAEx*J-6TdnQukvrx@CPUwy2eTb~#Dxd0I
zcSQt&N%3+pcV0J7<NMEKPqZZ{*5)<3cD2`dj}8PCz^z}SADx{1ioIXoQwc%OS4@`i
zyoJgg7T>2<fB@L<_`hP@HS~Jl(h3E8hxk6EO+%)Nd%H)8Fqi$lH(HL)Por1@cyoIk
zMLV*MXMLSAD*E7Q{E4MwMce{pNo9{+4qx58n0PfdM(5<zw6YqiQy!`MY-{~j0(C6&
zt2rs%r%(MeDkauOUB)~rw0oOEZ306lhfgdvC(g5TI?#p$=SUpUH=LhEZ!~V69GoLY
zkxlEv4#5P9Dk{X}<>Fu7s%97l1tDmB#U)>2!e0Djl~w3mAG9eC4b}YeR$kgINgz52
zTJH2M6}xhk)W{@pXV+bqJ@jDT(|U6v6nDf}qonFWO`&r_Vw8;~3*770yQNz!&bv_p
z0->Y>EqqN*FWRDIQ@IxWNQn+MMQV#@)+wF#Ev(XmDZOurT0bV8PHvO#Y3o$b)xF?`
z&CSOkt;dcGU%fKX9NBrb%S#C7;vOV`-?*VzVkPjydi>M7ciG=fU0C(3Hy-hv!4T)G
z@sgnzv*}4(3P}@gM_ZdNG8uW7Q3h}_hKBC#mYN!L3cjD@R($N%r)$H+t!>=Kg~BIM
zATEiYy-`%O#IEfsAn4Iv@B-a8tgep8Z^j^_FXe?KPL12tu5XtUj&<A1<zL|KY|oMk
zpKToqct7Ny*zGJ$PVPH9lc{i7yh(c5)suW{faZan;nW-S%TI!j?%gw!l9#`N{Gi21
z=bO*!K2_6FeQu@ZdPHVWk*+{WEm-PL!1Z$A$PXL&F;8hS`AH}LBPVJRVg2r8E6tpZ
zt!a+Fm9CNybnkC8$j@0=Hn7S4i`}H8xgC-4$<6iCjPJYD_fkbJJvtq-?$WBZ8hO^$
zHwo@XGCw*_<g5P}uNABsA5~mZRJ1czCKDKl@$utF2YcR?O($F1XIWxN2;o|@inB#=
zoV2eCt8~6nbV8W0++3jm+|{Hc#Ig_mFR$%J&kf@1G#2WNzPa^hqy<ZiJQfx!GczTf
zaoisWi0-T<eLNwA(FvTkkCnym1tmPRdz=!8g-xNNsrh81tZXZ!HyxLH?J1^#hV#}G
zskV;$&jw$5y7soVQwjAn_d{!KVXRSHyaNS=PI_M>qp@8L93`h4BKWtdgiY%G4}bg+
z{P81S3bO>K44pFgeh6ZXf>3bdD|X-DWveHd=Twab8k!FYn_DzNczEI7RBgn>#B<Qg
z5-Y8*db*$;n6A%L-*vQAENxDPp5D>7Tr-MdJ{T)QP$&yqs$asyOgOX-#+JG{m~M7Y
zPqQ4XX_ypIc%GC}Sh+0zqIW;=V2zQakUb3^XyGw^wj0UxILTA>t7<@zgEu5z$2?&U
zb>HXKD&L&^#;!$obI{Z2`}fXk7^jCD<5_8Gxroc#`}<8JnpfKj6B9o)Hg4KdYs^ho
zmFvIQx*&<&qnS2hN;|P!!TzC|HBNc3^KMS}?Y-}4BOq74d|}(Y8Em`qttC3cqbE<h
zI(T2NAx}3af!E6E`SX^pFQG<8*~-kGqmHhcBaAXJ8xQS`#v>GjC!Pvj%O`4PJ4#}I
zMWY%Y&q@AVRbcuhUq;_-8%M;br>m^2I{1rmfKg)sLw;V3#g8A5{Q^N@TKZ_tTz*%)
ze|e9+k@sb~2{}Go?O<am`;f4ozwolMe<5N?SOOC|G_EXr(y(<qpZ$f<pdKOH_VS^0
zO1FAGBh>Xen;%*8CfoT2I^>L3hHm%~js~f3dL}kFMI`<jfFW0EZ{C0`p#`lHETwx;
zzDhHjT|M|@4cA`AW217NY6lBi!v@D;Dv*BX)|eEE5$K*HsrR+T&srblGwjb4stbq&
z@uM0(8E49VKM~yI*O-1<O;4)8kqEm^dA(cJ6&y%EKs-Xr+B&?v`~?_#b{%P!dq>WT
zzwl+F1nueazS5=0MQs9LY@awgvpJS*LmbZ|tuk*z5P!6peb69s^K!IG$htG}g>P79
z=Etrs`WsJ*q;F|ypIwE~@oS1<-sUzjaC5V+_UiTY=)3X6QL*QAtl&)fDdJZHB@tOE
z4fk$j(&VoFtD?M32lqp-c2d{9=NeC+qQmA+H(4-n!t5yI`m4P>{gwII*sUwNxr~kb
znN_mkgq4Pk*17m~N>eMth4e}p!OM|^*B}D!?RgSd!~ZrCCR(KNUW8R&?02L{UT*g)
z#HB0P2zfjV<=`}y?&?li#DqP1q$eLo)L`{M<?=0|&kbys)UO_9MY7ss2gBbPBV$Yf
zh?MSt*8C2L6=MF_P)+pP{axQN$(8ri)mzg6i=}Mu-ya&;K7VfEb&)z=;qWd9VP@W4
zlJ+Z*_$n#u(c)ao<HwK1?Cpt;);k5ccRCTe#U96d3L<QRj!T;htN6H-3v+!sS^c-!
z98Mg!Ykk00^W7vwuhcdxPD#CJNrN$c!|Kj02pVN<9Xshnc!jrJN&yHdDcDvrT@-mH
zjkq{Y^NM@>Hi}ClX>04gf>5foeAQw{{=x!DO23J54jWsJpv#7$;mm6g@P7IfGUm+3
z7Z{<0?CFt~l*9nX$0z&s66*e!53w#OS(VahKJ1xwc0te(|8@@XKwn>Dqg4{ODJ_id
z;gAT={$03~^Fdsh1K%>KfZfa+31VUr-prz+cV~wJ3cp20;}1Q{)z#VB3VkrDr&dO|
z85me$2D-Wvd?)UVa^#exNFi3s$m0`S%r*cI>FJ9^a4s(4+1A)cfEFVllC$nd!5N;{
z{|=mS2zxQY=y;tArEj@!j8)?@Q}bqDhQYqau(@0BEydh?x3sl&%l&}0_qX?+o<t&-
zc*m&9>uMdBfD8NZ_r(`wf*+GK<9=&F-T737GU(xy{v}`+`uqC!H$_saF4S4@*TPO~
zuR=qR-H&SHEWQ28%~!*^_E#Z68oRmZ4(+P{29wyv??TWALP_gkoZn%GZ5%Lwgv1?-
zT!0V6{4JqG|BVhb?BBE*UTMNagFcUE^C9=D)ziAoScixqD4$B5@!FqMAqqw;$?Elo
z(4Y}4(r0Z`i7(#NVnAjrbJ6rL5M_<rC^LSg&U+0q6Vkq)bA>?{f^vMv3TdS{An#MS
zwFV_C;3r~V%Y5ajYXCF(=3MkX+zk!FgdwvjqjAxoz3GqluEe^cL0e&3$*=dWKs3#4
z-L-`<Xy}plwMGnL4k+KWnXLd^<LwEz4x|9r)J#leGP;3lymcO14`Y5Mg@&-^qUC<O
zNKkvh5*IW=e>4n$-7-2<0@~M>Z;1(&U<~q51O$SU$>ySUM8W+!Z1Wv4KC?WNW=hp|
zE0$Q5xdJ)fZ%3}ltTO7xCZl;f!L5hyg1f&ZwQut(zUcJ_eafe5W~&%T6Rk^ML8~F3
zlD>xOI$%|6H&M?>1_*wMYKOXrwp$GWs;wVk$eM>>3{ZD_{nSc_*V5Af@^%)puJv@B
zir00O!GWmmY$#wJcBi>h*wfp&i$P0*M~56mssXGNhOOuj{<rv40Vuh4UXG<Vh$A@i
ziuZfJu{R~=FWshh$)T=-Fs&}CoFw^TrbP(az;1iEB|5U5rncI46*b16uTGIrKwZY*
zBm-GCiWLMa6=D*aLIdC2y)B#0S#iZ1FJSD=`+!og{rHT%`Spgw22IqoCJLRO5R78i
zG`Mg%3>>@$2TxF4q`VSCw8Revzs9HDL3ShM^Jmcv<yNCYgL;3@^Zh|etyl4hhaVy%
z9S_!qOQ?+X7uw_2AGRt7d06EjS_9)S5^mnQ6+$gCF+M)t(ZL21r67(fGf6cqCSKkF
z@Y(oyf&tk^<IB8Cz+N7Vyv*A+en8#<xJzFqcW|p5Eo4br)WP}Jt(#=tr=Ru7+X?}@
zkmRw0mAY5+`l?s}-ulpqmdFJlNIM00aSl%aOQX|e`11V>5}6`%-N|deUo9~)F#wMe
zkeJry=EqAZp+A275WYOyb>1tH12pl`ps}&>#>NIcJ$+<PlGjNF$lJgt5}|G<%jq^_
zrFN680?tKf-aeBA4%U-Z=X<>h4ta?4eKnA9o>%&Yb;R@GQ}P!T7IM+iiL=Lu0B%bU
zan6$p!XqERXzgroznc3X2?j@uDJLT%@ZGy`Krm%IU}nxtOY_e%I6K;w45dnqEMy(6
zMqJudpR1}<q&oJd$&Hp+&5q7rR9lbpb8zGV4k0c>?~<TcQx5YskHt;IjhxN&;}J|)
z8eZS#S7AOrzH`JQxdi_G%EO6Xj;(G<YIF>YRb+EDC%^bv=qyNwCy_SPsmkfSEk=cz
znat-F8qsXb%srd_7ZZTK7Tj&;W^KEe=RgdX+TBgvJKe0#%gW+jIs+65(sGzq@U9P=
zZ&+z*X#lmCdWN#s={m9w#&xN56-wEn=waqh*w`P`OX9Wqcp(9og2UlTO1*%n!@hCj
zUMeYvE)FK<XB45^)1xSD{_53nLm)9zD(GTRXsC_3dACLJ_VzYlbhU9ef9%T3%HpK%
zfz*8F{jC8BCeN8b#yyU%u}cRBhpf!Za;H_3G_P~9Z&M$KPP{(mg%B97h@Q)@oG!%M
z9KFDTA<ky00Xw&kT~t&AC|q)@?j?e4k@sMl$R!CUD4xv6=)I>Dh|b#r(*#gdDjCXv
z;a=n;_mz{836f4d8J)aHQ)ULV7E@|dC^fa9>()$T5aMVWqiV<xoAhEYT_leGE)~pZ
zbs&eeje(BN*Wdp}K=YXbE)-m6(|mr5gyj95M>}PUiQJ|6MDUHVGBKugu*+9(tSl`_
zF@?N)N6u%ht*F=o;suUqW2RK1z&S9&W3K_3J(t_;8%Dur?ds+R@`oQ_DU2d*_%ta}
zi`4RTkv5YHU@}bh^)*~}E1#bPJgem?*gt=uM*(Z-dwr7dz=yz)^9P{p@NfB$gy0cg
z&YGE-P5JNjtLe@A@5ShOX@LE{y87}X&&$lLtbHv)`S7ZXlb0A60pCqKceFG$H46(1
z-}w04rKK%RZ96$}b8&ImHEnRp`10koq8sQfm5>|ee>&>9Hd#G6ISEt_z0#oSsy#ru
z6cl_=Y%OF(Xq;V~Zi0~fbnSbm{pLC#9F#6^^nW*1sPYE{b0Xj?x;{T1%+upj0gMlz
zpR0AIQ^%Cg0e6~apCxzxKne7y{k6m>52w?Lve$6_moL+!Hq{+1Ez^q+uFFwS(w;Na
z)zwuU%>)4wN3YT?O0nGY^Z*c5UOO#}+Ptg83(*-N;QpattRLFaq$+3i^FMqTD{?n8
zMr(f`utnkz#TPJsdtYxKg@lA~#buY23@qthoN#%a9ew>uC%rsfA5hlM3p%&qc5;3=
z>2Ue>eQ>Y`0Fq+O9NQ;L<1UkcJGFFmEzKCYmkJ&}FM_H602w^6IW_f6M<*dZK1)wM
zy>~mkE6wX;2AH7>q84kKmid_n;B7oj?O9v1WUst=!!ID9sU?E3tn$BlrKqU*GnBfs
zT1bM4jh#JF$lX~~v<6Jmvi8{`2IRYU?{r<K{Qy^)o}TW|+XNCzuoQ>RZrkaMlvq);
z6$S<d8W<RWMJZwi>EHAcYiD9+rakPLY`ffUqDI`|v51sqpm=0IH{TY+lxl8nZja)9
z@b5h2WMK(X)clPbZ>hf8X$(`V2TT6br%!m4{6?9)(#vx#5uKkNrA+2NrX$M%oaQlr
zQ=1>#*Y#X~r|f4GzWn*x`i6?t$;kZt{1imaivU%cr(1~$11tNxNym)y?FUwlZ};MX
zl1A$b81wqifq>en-2O@N<;xe7a)bQ)JUl#tf@eT*IB_WEs5*Lc>Ea)ki3!X5vGWde
zy1E)+Zk}QLwjG}wBJ<m%46468pS%R>N{&v&Ko8|IKmHEAakMeu{DXpmz<>SRi#4r)
zsH3S7)m;akv_4slIIY6LfbaqRO%kxQw8U-t3vhihE?-yAF7R21^%Qx<vicJr+SLIn
z*UXF%u1T#afelDbute<ju0r0q0msp1a|;XQWo02$LL)tt1>U^lqnvDPR?9u9lJD=l
z0y9t`h5PvU7^q0Z46;kXt!PtKVOlhJrAQcL3l11SKp|@V`e^FIJ?H?Z`jSQ(?5jg;
zb0lxcda!HoU`WwDu;uEjZDHe=Kp+x2eLZ$%6vRmR7|m??JRtJOw>rYbpzsYO^~M#m
ze%%3rq#?RFk|9*QF+_GI?XzCrfL#+!gRIe|se~-A+GDR_gP5cNuex5}g>(A~0S`Et
z=_{$X)Fbust5Eb~rqoFLWpw;p%DcnEJ|Yea?Rb{={!3pK%2ev?w!S<ttU@noH}NXS
zxjfuMPI|3^DQHUF!*J#vN7+O0hnni?xrCD-<gJRm%a(5!>BW9<$!~Or%zwDhI7l%g
z`ybk=qK=M`_1Hrj8yldrsH-=}kXB7uH2+;Zm_Ohb5D)>o61C?ZA<S2iU%$qCv+7iS
zC|cOm)HHWwe|1nMwWqZ7A^dHA_{fN6u_jwYixF3xW=?KS&MoJMLPC{#)m}hvy5UF5
z#1#0aUOPulq)Kb~k&(5%pVy?FtSY$sF##Sq%xHV25zOmQp@SipNzW#mA5N<SdKWt}
z!k#CBJI!~ou&}gW`P7HJr@B;{`X!_O)2zu77d>C6LDfD>%%2tp`;w7izS2j}8DaH@
z7vQgI>oaM9tGqT7vP=NSP@*vfe?6%-E>YmuqM}GeO<i4KyBTq>O@YlH#Kgp6Oy?_E
zd8HrytgyWJBmb^Ag#TM*H3$g6r>?S@6qYszQ40WGKOs_74^1=ky>2V{(0CO5MO!$o
zH*JsIo(bYWiQ+);2_j*e34mYPrld4o-Ygxg<B||Cd66%VSrTjz`~G8|Izhd!;L#@2
zAKEKuFo5|{uynrlTj=~#5WVY$t$o5#O5SI&4`L!lg~U5IZ$2<=!1T(so&6aCbT2@t
z{{YKfS63H2m#D<Ji(VSs8X!N=gU6_WY+?Q^FepeyMJ1}DLI8%^812hG8Eg39{X=Ll
z=%gnKd`u4(*>$;HO5&2{TLT;~EC_t%`2Ha}2>bwBr&_M|@^}RwYz_$UR8&-B&z7jI
z9ruost{j#FVfeanuygxQ$M239(A32Pa@<41j*mR+xxN)c1+1e(LrZIGvP|b7dcuPJ
zuD~L3n3<VNdG5(OIDF6d&(6;7>FEJ_06hZ(FAvZB+?=gDwcFAcu!AH$a#--e7jABA
z;~t5A4tjX@(t!SYTu$$@dNj|Ht+=?aECV(^K4K*!Jv<`9PY#oXkk@mv?nD;%3Ly@8
zQ*G_z%gXyXs%?xn5bW0j;>m?J()BZg<K7SB{HR9P*8_XCl9Cb@Y<PGW^>|<K2Z-_U
z1olAZ2T!(bymRLcpxB*H_RI}%eK7Eyot#1f1D{GsO(pxKs{#>L_Z&pR2g|)pW?DH0
z&z`EQ4*?kurS7I{0W$(B{-y-8(pMq{3mcn-jg8)|w!V<{5Uw5=hgX!A-~E`A-wf;`
zkv-rUAky5W0O3;gADTwnWlF=;)<AG#esEmU`wmfSv>_n8M}lU!xw|tmFj$Y4gb)-0
zOs)^W2SP=vOibF>ueObUN(R0>tXd_OAgTb17ihgeZaS$*lTXl8S3f%2?Toj`;=y4a
zE`B)}#iBNc+Q;&;vw?6y=&YX7eeK${Z_1f~$3!45kB(g7&G{ft!MSaiNyJTQCTEc1
zqwm-S-r!foWe`5>OHQpLCv$Uifo6Ndudctpe`z}BwvfSXZV}4(*Fc7d9&SI?`b~fk
zY37HivyFLW%W+Qr)mBqeWn|>RYu3fehkUBIT-4BTo}>3EFj!kizXk`6S?^26R>KL~
z*oYV#XDlm|+c|hIEpytStdeE{Rro!r<E>qss(pV)$jy3pp&i8^Eu~C|T&Po0RT<Vm
z!{0lvPhLvF-`{EJwNN00Z%mxGo1yXXJ=Gb%zv1-sX(J#~8ykF`lsnP91CB|CKJZNn
zZXJx~37>r9gMHN#$%~9kjRe@}R_vA|%PYqapQf6Zlas^f%PHG@vVR-2wzPEJH*Coa
z7iQER>j$hWi`##t$foB4jfYQ8^n`@m9T0QaOECb)v2b;gpNVHF7c@4C5CCyN;rLjH
zBS!M{L>TF^*_6PK2PONDT@l#XMCjeVZ%A|51UQc7<|%aSi{<rk<PX8!^rXTcm8VsE
zibP14hPRLX{3;X`h3R~aOmbnqH*cO@yjlW{0@30<j?T!IldWPDRl^CxA)Z+}GSZ)V
z6GHK#WADF_DK1V1`9i7An-oNh6NM}Hw+u$lMsP&~YWQJ8gteXoLx7f25I$B@>HlIq
zeg_MdrP>kRmQq&v<xBmiPvtL*B{rgL|4xjtAV26a8fhHVypBMej^+Z=tM0|4rck}3
zt@_F8wArO4QOvl9_ibz6Amo3;IXXth=~@L6{&)Lh%vd%)c7WrRypA7DdeejS=7Y%7
z+1FPYxw(Y7OK&bYR!<t#wq#UfxE)n+l2s-HpT)QSFP$O?g@XrtNV2}Jp`$-lh6sZ2
zf2#@PRwHIXrJtO5UmlUr2>+_D2c7(2+?E(G;L?knj3$P+wq_C&9RM5?X0@F2$Gy!@
znbljcI%q2U@uusf+Z&(r-d+bR*zMatMN+ye-T8z^f5!^DlRY7YZA>5z$eq6hUJ_4}
zjWIdjuv#BITc`Eg#Kh5IoIok2P?Dpl7IJ1OvVRL@Q!jvSCVKLgR$UAN{)>ml39!L2
zdKbIFw-w}KIqfgb*zC(b5)j>d@PMBFqH2F_tV}#d7bI&K0DAQ^Ws`(A#)5{1T9{S9
zH-}@h?DWRVd&{dOmMwcbJ3~mDTQH;H!bOQtuRwyHlz`qup|%l6-JCd^Vuo@~o2$=j
zI-b--JN0-b7XDiZ;QxW;spFiKt}5TQww`Q2?}A;wUgZkp!^))}NDTgrh1_b@60R^#
zr>kv%r>R`3AuDw&b{;9}fAWN0EI>H?LxEz(-ukzXPte-J^);H=ym=#}g{sban(MJ%
z2Uz+5?&J#8w)D;NrLl@WH!#-eS8hd900IUQ-7B}(2seNO#qf;!IG$;85QvKt?l#6O
z*gm&G7-v`72HEm6kM7x=O){JwP)b@mVS=cP>s%&EBBelILG)&@$*5;NtB}y)CgQR>
znk2{P>UY=eqEwlb%&eED9Ve3J=BX7GZD24Y-tWy)F%bYNoY8bvhJ${7QIFR58al3=
zyza{M^iNJ$JRgTE@WO!vU@y*8LN@8*W?P~CE62x=-zl$j-!^5oDD5PML@BoTE=*&?
zieFCB`&y1VyN;JXx^+v#v~xqfN-&C`&~|ztkXTYhwW``~HYkX+`pF&@lm5!_RW`PA
zY|;rld}@a^bu`%5{Cx2*u4G?~Z!Q3rp%slbBP+9XM`v}ByNkTtHa;7hCQ8R!yxhE0
zC4e)?-{Eo2R;<p?Sj1=5+{=zoI^3SUO2Rgh*1v*BeF4wGTTfOZq5#8!{j!t?uYT&6
z1@Apt!&KP;MxYleDP)94h|u^hIcEFRZ)R!Sx>db|;2!VW#h?qP@+D9kOsx0c@9eDJ
ztHm&_J~GrA+|zReK~0xasXJ1uoV2S}{!{7a?gn4K5N5U<THj~VVsQWUi3BmsM@}oN
zj~s}O!&%!V4v()+Pru-`bnR?wt8c>&^8E?kZTZdQwga;V_tDTeGL;Kny&^q7KW%K<
z94lUpst>3RYe{3%DfdCt)#MwT2jIk2z8nNbKkbONe*3cW!kzN1<Eu((*E|n2K4?<*
z^ryq9)Qh2fh?VS}6zL>>qOpcTXY<UAi=dGE<S6bK{)LMx0=wo)sRn7XjAQxQs<*E0
zhcWDzuD<VzQJ&5sRnv5-zspe>xPj#M*fm_7^H;va#^%Sya>^XmjZ8b-hDdxm&7dNX
z4%CDb=s;F}V^{Jy#Ysiur_R}+wt9CRRXl}T`OLr=n&rJzsOg&NU0ll#^DeG=0~3Au
zyLB|59Zg>+U(@XBme?AwMWCsZW|Lfr4FEUdf6M;7-YDxk7@lmxWNbkAl6XhK9nr{8
zPtkqL-d#&;Kng+tbslk2Z?r#br!^x6t@I@7bZg|`sf41AXn+ldX1tfKOo8W#U+p&T
z$d?)dEGDqAE?ogvzr{($Ub|zDE$Ts_GjKh~R|l&MoksdCd%o5mc2;k7gH~gDa8)C?
ziq?PWih%Ff6#`_5#30C8C<q9qW@mc=!v+jzj=D|lOK-BDd>ZAHwL!Cdyc(0q0HRe&
zN}-nn*}xz9o`Ns8q@?8gDMKGR_Dh`-=YS`5AonBjW-~j_ehG|oA3l8GPXJ*<E<mx9
zia*jEI=9_h=cKEHc`?$dc6N5xow#sze^S^;rS>#Yxo3a<DqfxWw?t*(g<@$Xh+I+?
znQp$j#iB~~Nyf=(ztnE_M`dM{w6TG~m+pGNKmN@K1(#A$Q86?72LJLbLmAj5t?oR}
z*99X$(cQXq0|#eq_<OoCGcFbuD)FkFh>niNCS{N1cLq*Tkd!kqG1cjS5E$H|H(f#R
zhiieC3N{Jr*1-Wg2gl`ddJ=fBp4&3Lb)K!ew)PmfSzB8haG*Y(2Y31O(9RIpfItvk
zcH$RMz1JgC>3*0Cm_!zq3eQtsly^XHqSWrit5>fyHAjBD+T9S~q9KW$zA_Z4%C1$w
z8Xp%|X43HyP=Mzze)l5nt#%{2`}*eQ=IAWn7{vPfUsqEbEHCHJP(A_1svVWG(o$s=
zm9mNoVz~8qIeknU1vxpHKkzVJA9dm%2W}@|JF*9MD&0!AWxi=}ygtICrluxsE+*y!
z7`%L7)lvJq8?+l_^1xJ@dtFjeGDr3Fvk!~+6L?UK2X;+W!_S|EtgBN~1h;Q%sH&Re
z$6&MRf)M|LI^ol&cD0SEshYxUFO};tP6_f&l?2v{_&0x%JMkv~{2|SH_wGhYz$$fP
zr3p~Xext!Gjg3=}6Mf!-xop|$sfG<4Nv?ZK&*9A=c~)VL$}s%X;N!?L3aH1FNZ=F$
z#H1?1{ojGOtQ9^Up1gtrBM|J3$dsvwhzfy_4{y#;N(Th_i@hyi%~Z)!<>BLdS*#f%
zA%=+sPM4Dd`o5`YXMzASit!4qC~z{y9`_3a{suUI1ciivHwT2>vXnfC3lCrh;G1yu
znY`!m1u+F|lhj^E1{)5yPmF={7dQw3Tdm9tsLRZpocV(rNWH&WIeE>JfBf(OYz{aF
z_>XVhx}9?X41U0fxWBcvwY@!DWKIm5`zHZ4$`iIQbz;t>{s}!_PUm<)CZH%PA%XJF
zoiSi)0?ZZ&%?AeuU8E-Y@h8R#Z)Ou;8Dd~A(K5dy;LOUzl#!9KoP(U;`tFV84IoBC
zheQY1O<!$E1Kj`+YV<@cV3d(oqX$#BoS9`ySTV)$^=I3)4eYk9_;3=?4XV(=KikX2
zk<pl<04kjEy8H2BEj360Iv&K~Gm4YG#RiA$H03oW;Qg(k*JX(5f9RS)oq8>)+l=1d
zfRkJmy9^{@1Ud_Lfqu86c<MtjYN)1Vbl}=1N|otIGEc)GPrUakwP0pZ84MVEW78Rh
z-$UK(X0l9DcSB*l9RWH(LNbHS7)zy~*Xnddz(xR_`f)golU}dA0ibk^JbAT>v#F35
zeC{4#+Y|5vz6#J5@{qXto4wzcrktt<u(`39A4L#eO{&6xyLq3}6*+MEwjx_5O@9F!
zx_q%XDQP`PJH6W}BI0?n2W(u9#xeY3Kw}sHmdAm}qNB-c?MP?}!MSP?0CuY8dHd;u
zm6a8{*`Kf6-C3eq>+0avck4MpF7})`3ZMoc>TdYKQx$KKk`lvvdV5dzR~KhzQ=Z)e
z9zaZ3cXzjMSWS(nfq^GZeYRe;E_2k+#zsQ8uOFCf$GeMIFa^Qw27nBhFu>&G))uu4
z4{NBan3$v`B_(OIAMWo1gKeHyjBn*FD)u{Q29v&WW7OzS*Ncln{ZUd}B~#OjY~UQ#
z*VhNE-jyp?s*V>Zyxf7CZ=nOw^^YDsdj0yfhYFx-0HXjVAltorpCiG#yH7*ot;p|j
zv;~;j=hDFF2Ig4qWKn+p<3syDHHD)8wU=}H5xFw3h5pqZ&taa4JPE*-6dmGAk&87w
zB}M>wbQk-v#G$6g`ciGN&4)0>a{byj=-4EJCrc^78oXJ3c`>Mm=vcS6vnz96|Cp7<
zl3MiTOKnF-NEYyt2>@D}_QL~SUVC~<N=iU8%cr+>c5(o~W@iV~L7JP3^i2}pB?Bd;
z2=FJP4uGr;=>E=p8#fo%4Qy-?pi13;@pEo*5jgV)ryk&DDrWWn-5`&}hip@}*~ce+
z@11WW5ntM=Aiaj@hdy%`@szLeBKOV#BLwW0KqXta0IY|$mKMtgse7q0>^h3fQ76TZ
z1Oz63yy_huj#E4V^9j@;$j5O#VTb@MHa_`-=D|TV5hMtx4!V@5qoYam^d^Uf)cxSk
zm6iMQ^s0dk(R#k?Gm#Hqb5m1O7k?$RwX~R9ShNCG-z9E2$4dc6qGl-&Grlx*K(-aC
z!HcUFCR;0h9Tb?M#EGx~ycXb$0A-OHxiO050Brswk3pU9Z(Kdl6pk8&s!FzJn;hKn
zsfF8fLid-tXMy7JB@$R~iQwwd^R26n{00UoLUX!gY=S^l$WV5hZ;b+)5E#ZB?Xn&-
z`s*ryv{g}4Q<4Vn$=!OS!KLLdW5ubkhZ?Ef*fOKhr`E*_KPG_wB}w(Fp|_Wtj_zxA
zcJL%<pRn^9P{uNqnS<WF!(j$ybZW^Ea{7oC2|x@V?-)y)8yY4fk%zOPB2|WsHvm0B
zFBAPtIsmx0&AMnn^Ab?a`xG8d8_}X3UFmhs51VU`<Cb8#|BacAO%COS-+6r%!^GIw
zuA-Fv_Igh3bR8kVL5CUfLZFugK9rEjlN8)U3v;CRz@viNzZ@9}s>fMJZ$OZ`fZOKi
z{>iA7Kso1dp*#Q-v#aN;r5$u6J5RL%s@Wn=l-SQhqF3;TxB<5W<rt32yn)C1Y5-mu
zDvFkqAl-TD2+r%e&U;&jh8=Z1h5K7}*}Cl8z+N!YZjy|BOecZ*7(YIcoq!T`RYZ;i
zDT9G3uqHvyH;(BPQQwMaCD^~_5wk|Cxmr-LR7cl-0&s5Xap3*(FohWqEPCV7{9L;7
zp|1KN^tt}6C(+%5i%~3qPoL}c2hepOa4SlzZuA6Pa3G3Fg4K8x^$Cs=`;s!a`;zNh
z_9a2o!OfX>?5srZP}T?jpweXQhAZH_1k7%9N>pnS+D=kHFh2u|qrBx!&%4oS|16Ud
zRm&e?A|=6kf&tFcX|PDaZa_IFbTGQn@lluRv}PuQOASF->78q$(v6;s$^o%O9UoVK
zj?{3mQt7DE-DCpYR}XFk7h{5Jey_rkDeQ|xJrr~j!mhV~6`|^`Sn<2jb5M|;)fLt4
z_XPeNj0_05v#~W%9aFv5jedwaf3;^A^=$$8_V+rjnic(Gf_4xRd-JS(U8<w~f{Qwi
zs>{X>hJ%BBxZ`UAaQkdc3<=N~D-iTU*_0+apYg$6X+eMuJgv~$74Xe<aL|CJ#Ey!%
zMIR98pf*Dq_VpkzdLu-j7jJP)be!=nucJY4$OzE2b03Yfj-x^OHzK{Pm)X4^;Sd`x
zv#Vo+&H2yzGLU3JG<f78{_X`P9pr5X4TXOv%l?}hG)KCPRUj>duYn|4Q^QoCyf!do
zd~HLxW!#epxY0Ot5$EeAs?82ANk$8yR_m}TxiP%oUboAp*FbAH$e%ZBMuOc=*VR^6
z-uL%YIygkwau5+2Qh$Z#vw}{L8ODb3O$^<Ql6PM#ctlTsYb=^giz})%_MeV3Ko4Ip
zcC(tSA_SgB7PYGS{;4&=s`7H@u~Ju?&3ma_Y57|szF~WNV_xTJr$^s_(e~@tLoBfC
zk;A3*r>+<jpL|Maa`1FL-$z#dpk3^|TnxUw3XVwG$1F1I?{G(aA=Q-{s=mAi^EKA6
z+5DEJ_R?=Zb~8$NI>W9wM=uE$B_9+tYHjfu6DFZGjd3O{!dwBS8gy4sa4a)(B1!l>
zqcLc5257@5-|XqXt-88yOu)OKtD>?Q6Gd6-S@9vyV7e}cnDKpPwg+PNCuy1VKTN!d
z(wHsn+G3bY_oN6_U-khL*<xpUS{jw-a_ZZ<Ivo%ve2Bv%hJ)CuO`XS=fQU+XVW{8=
zT*|;85WbzSyaLN^GRs?8MHt5tTvP+1FeH)O^iNLj0r#`CUkMbp5h5@Ff0V1~&^5Dj
z|AMTiYpWpZWoLQ003aa2j%XYkCg5UEA5KNo;`{UGWU1l%_jsD?Oo2vlW8(oa{C!&A
zvC{6TX+rtsMI2(<4|}D~>u<AODxjkLl=yh@^cTCk98r<VzzQ7p=?ra<w%+&INm>4g
zdj)A-e@kKdZU1gWts3oG{+4_#pkY^5-rMEbOj_T0Xsi0<$pFYR)@OH{o&+V{8W6)I
zJdmy?x(H2^&&gOWjZkvAxD$e>49I8SoUN<5BACDNz@x|KT((J!5NAv6YXgmF_YNH~
zjc6;&v%cYDd|)3zR6WJ)MqGP$@iO7PlkJh`ll0^n($pTle{dIFHd5+2&(C&MWrbXy
zRM#(*l^@*U%|-xoAHMLz(?-%!+5X;-x`c4qgpZ&dmA{Bn^5haKyv$w;gXQK;Xl|bL
zOj=1vgj_&1qgv?io;gBzU7bXZW^sC1*^{h(^9RcwEn#5>z${Gw3bRh!eti;$HwO}v
zKKK}$pZ`2HRYiQ$T#>cyM%H>5-sS0}u?Zd)KJ|BldUsu2D)3ig)!Z`=v_e?v>i*QC
zwGDs>{RYIvZbXdQocku_WWkHTivz$jW8f$50d8AXFyCsF7A|GK)3dUonc=7jyqlGk
zr#tj6>u&SFTWwTm4(zj1PXif!|IMP%`QlIvAezI5>nsGm)+-1a<YqD{y%9dmmde4q
zucEN(ZoJor6HERLL&U}1=MW%n^QqR1Td>h7e|uqex~Y-fwm@QHCH2?DTtMBs0`dgf
zfc0$FmsHdP=7dsFfw5rZPB9I@gfX9<&d$VhWbLS?YAz+Eyv(W5au22C`)v1}mL}@2
zR7-9sKU}>NJRh#kIEUg-{!uk69D@e=s!uL1L9&2~sS!GK=`wpjvW8XTX^=qhpZeQP
z8(=vzB-5U;BtUUu|5qz-_4Ua73mi$OUIQ@yzgFox)^s?D*qoW^NfR^q^@(Y0$T;+Z
ztDj&p3vW3vKYT##rK5-DD0^zrIL1{-o!kGueIR#vcQ8n8K}FFC2xhGKTg_Oi&kwXh
zsf0B3o>s(Jyxmj@*b{es|6gUelLa||XMwyQwMDZ5Iy=`^;D42UfPx$>7zp@J8ZlwN
ze*LPe1MaVONor4V%rB96WSmnKn^nZo(^xJb+|1~=fJ;4oT>I^LN|7ep;In@u9FOxp
zB_xzp<@_gM0hLC7RQ~$awr7--r~(}hXv?x`s#z~zzARe@9MQqvp2u22Q`PB)0K6F#
zp!y1B=jKxJS${$zk%}3ttgH`~p1MDSAPVC>qQSJ)31HTE_~Iu{w6UKgA)JVa2xPe^
zMeEr!QKm}QZ9`E}@5d}2_cuTR)8ABJHVKwFOqT*y0pLvm0V{|v5nz>ir2JhvHpnZz
zTwGXCRZ#)5b%-LrdC%ANQKXVIsF*dkt@^joYHV5yX>F{*3#y17Jm~AglK5M>+0gr>
zH`C3?Q(y{bIrJ`b+F$AS_VxzEObTfFpOz*OVp~VY2WEa8KY?+t3e<(Ar<=;iv;iOA
z&qn|58;>MhqGDnyDk?6|HxYxIS|AYs%ofNKFZS~g1*|M<w+<1)&&pasJ+vIEpqBHY
zUZA-B>HymYN<7xl(J4zICnvv`3R1n5?v#KG;z%hvZBSxcR%_X-@E8+SBKgyEw}TH%
z9AH&iB<UdY2ia0L2h9g5Oc-k$FG!^Z=Rw7o0Whh)&))*oYY#vQ2pk_CTeTR7<2Jo^
zH8V#wPtVGflowB)_<6MeDHqhR@$n%W8XB0C(qj1~QU1QxGSa$GwJ!I`pq^#N6NIC!
zEvnc3VhQq#Q(Nu>WR8WN01}~}K<s#oxGu&-`M@kJUmcufQQ%c23PBi5sNV&!U<MT%
z0$P^|oWj>PwA6D{fiLC+SoGF=(?jEKglt%to5u;bYyg@B6oj4uwRx8wRIRP8tdJ8E
zM}V^0m>AP4HIMn_<z?S6kW2aK0H+THuVvRV&}*&FPxd1i<Yr3JQ&XQyyR47gx^u@e
zGvFTuVmZq#o<;6y*CGA+VBMJ!mvLgMMw{b*<|x*)KrOwFOKxOK18XotO%jk*Q}R1D
z%lf4`16L5cuyCTH+jJc|@J3nZ*3-ZHONlPm2#ft@;WV%p0YAdV?Cf`tOZx1h9FM`l
zk$*TIOG=^zR{m0SE5q&f2GoqbXnGIIazWkfw{Oj#8P~l#Yp;5Dtb}#ej)tzSt${LU
zV3Qu~>)YF$tOn-K93IDxAwv|<V#4PBQF&{zIt{#Eo58xEo*RO^3E=<Wga!ucJv}{v
z38MQpCAar6s8D9jCLW;!S;oIXbLinN{@_xfX^^NSKzZ+wl*o@a7(FD!f>E2`X|Mz-
zT;?n4kQ7kUU+7URY(A-nBdkaqm7zF`Uq%<wpz@x44otTHMDPE8%>RL3VW_RoMEl%(
zALqp~yCbExvVaz!j0*&U{M00^a%`Q~25{DK^w9t(_<w%)VE_va;t!Wdnbyq)m34(e
z1uB5k|1*w9P3eE_R;*J^)LFL~jE;BuFtSY-+HuFQ{joI49Wkms!R~o<BR>a~exR?7
zx_Gq5e!;-|1k_Ws)oH!OMMT^9i$Ik3a#Glgv{n<mna^3zr4QEyK7<jhPSt!8I<<jI
znJh4gR4>l&nCVR}9&DTsEk*w`LjSEM1Pe#IM&)!Vr7%4F2E6%jQVoxcW|lWCeeqzG
zZ@ft|=b1PoePySWQEb@$D)-kOb341ykZ7jAl*T#i@*1pa3u%=YF-P6k;jtG*C5q(}
z$Gek!ycfU{)FpCx9O!u}PXPa?raUc}qNVHgYV~IbM|6y7S}I!-pA9jLj@tnj_VqK3
zUzT%g<mVL0PC~f7ebpx}`nRK{R-@BSs|%o#JVB^J454BFpWs-N;jble+OG^&KSh&_
z`(fL-9K3xkJcdsN@l)1wo*ee;6dFk)t=|J7@1es&e1?+R#o6wMIBveNAH$r#{rEu`
z;oa-^aZ*(Cc!p>{$eLN6g=E!scR$V&dV*;XOOR{gkCl-naIh$n$M3|vyqvE02vmfC
zK=|Id_CG>rz0%*K-VIxW+kr-P9Mwh@r4J{o#)q;7#jS(72R6rAqNLoG63m-NieHuu
zmg-3`)_NvFpJmL8%dcX{>sEWc1f_=7GS=1xsskfEJ*^Il?DPy&W)>E|T88h9)fHO4
zm`(rn3-LJ;bV1Ib!`hmNG2J>fH3|g$;Mn?wc!P9Ywu0+XY<i+1JtLxq)Y*RJS2aoW
z^rX{lQjKAz(|OmM+}B_hFDWuAc+D>@b&Ywv>FH!T_n58|*_=e!|D)i|pMZAk?*((0
zS{c2UMonLzrp(Ti1o(x_Ac3m!pZYmj!8<bQ3?Q5q5{e-R|FC^q?Wgi;*FIPcU8$f(
z|NHT7eTB=VXTf44X*$ZYQTrw%MY8(qGx30cyrJ)=w|^6>aZ0{^WfgMW`igW>2K6vj
zqa=0#_`k=s9`h*q@5H<tWLjq=Aq)&OQ%|Cpc{w(ds}a>lM+tT8SZzQDH|k6b1?#}e
z!nnvO9}~sMB>VzG-D*sNCum$XNb!Kqetz2dEl*^i_3HM8DrwCrs)-FpPE)4`8rm7G
z&ZrDoF}busuToRMYGfrjIsA(lbxSkgr%p7>CAUPt_mG%kMpKL)0}w>@@1O$OzyDwi
zN*P?bVR%Lc10gU8<j8-%8EEl<9Q)v!C4>TxKYmOGB_IO?`~Mr?wp?P!ROSr2TU76Y
QvK8p*6M6Amxc-~}4=4CJsQ>@~

literal 0
HcmV?d00001

diff --git a/doc/devel/uml/index.html b/doc/devel/uml/index.html
index 406fc303d..bbecbcbc0 100644
--- a/doc/devel/uml/index.html
+++ b/doc/devel/uml/index.html
@@ -112,7 +112,7 @@ Documentation</title>
 <a name="refartifact128005"></a>
 <table><tr><td><div class="element">Artifact <b>Lumiera</b></div></td></tr></table>
 <p>Depends on <a href="index.html#refpackage129413"><b>common</b></a></p><p>Depends on <a href="index.html#refpackage129797"><b>gui</b></a></p><p>Depends on <a href="index.html#refpackage129669"><b>proc</b></a></p><p>Depends on <a href="index.html#refpackage129541"><b>backend</b></a></p><p>the main executable to be built<br /></p>
-<p><i>executable</i> associated with : <a href="index.html#refartifact132229"><b>exitnode</b></a>, <a href="index.html#refartifact131717"><b>pathmanager</b></a>, <a href="index.html#refartifact128901"><b>track</b></a>, <a href="index.html#refartifact134533"><b>paramprovider</b></a>, <a href="index.html#refartifact132997"><b>mask</b></a>, <a href="index.html#refartifact128133"><b>main</b></a>, <a href="index.html#refartifact130693"><b>conmanager</b></a>, <a href="index.html#refartifact129413"><b>clip</b></a>, <a href="index.html#refartifact129669"><b>meta</b></a>, <a href="index.html#refartifact129797"><b>fixedlocation</b></a>, <a href="index.html#refartifact129925"><b>relativelocation</b></a>, <a href="index.html#refartifact128261"><b>mobject</b></a>, <a href="index.html#refartifact134277"><b>source</b></a>, <a href="index.html#refartifact133765"><b>frame</b></a>, <a href="index.html#refartifact129029"><b>placement</b></a>, <a href="index.html#refartifact128517"><b>sessionimpl</b></a>, <a href="index.html#refartifact130437"><b>builderfacade</b></a>, <a href="index.html#refartifact131589"><b>controllerfacade</b></a>, <a href="index.html#refartifact132101"><b>processor</b></a>, <a href="index.html#refartifact133125"><b>pluginadapter</b></a>, <a href="index.html#refartifact129541"><b>effect</b></a>, <a href="index.html#refartifact131205"><b>buildertool</b></a>, <a href="index.html#refartifact131333"><b>segmentationtool</b></a>, <a href="index.html#refartifact133893"><b>aframe</b></a>, <a href="index.html#refartifact130821"><b>assembler</b></a>, <a href="index.html#refartifact132485"><b>trafo</b></a>, <a href="index.html#refartifact129157"><b>explicitplacement</b></a>, <a href="index.html#refartifact130309"><b>auto</b></a>, <a href="index.html#refartifact133637"><b>glrender</b></a>, <a href="index.html#refartifact132613"><b>link</b></a>, <a href="index.html#refartifact134405"><b>parameter</b></a>, <a href="index.html#refartifact131973"><b>renderengine</b></a>, <a href="index.html#refartifact130053"><b>allocation</b></a>, <a href="index.html#refartifact134021"><b>vframe</b></a>, <a href="index.html#refartifact130565"><b>toolfactory</b></a>, <a href="index.html#refartifact133381"><b>arender</b></a>, <a href="index.html#refartifact131845"><b>renderstate</b></a>, <a href="index.html#refartifact130181"><b>label</b></a>, <a href="index.html#refartifact134149"><b>glbuf</b></a>, <a href="index.html#refartifact132357"><b>procnode</b></a>, <a href="index.html#refartifact130949"><b>stateproxy</b></a>, <a href="index.html#refartifact132741"><b>hub</b></a>, <a href="index.html#refartifact131077"><b>buildable</b></a>, <a href="index.html#refartifact129285"><b>abstractmo</b></a>, <a href="index.html#refartifact131461"><b>nodecreatertool</b></a>, <a href="index.html#refartifact132869"><b>projector</b></a>, <a href="index.html#refartifact134661"><b>interpolator</b></a>, <a href="index.html#refartifact128645"><b>edl</b></a>, <a href="index.html#refartifact128773"><b>fixture</b></a>, <a href="index.html#refartifact133253"><b>glpipe</b></a>, <a href="index.html#refartifact133509"><b>vrender</b></a></p>
+<p><i>executable</i> associated with : <a href="index.html#refartifact133893"><b>aframe</b></a>, <a href="index.html#refartifact130821"><b>assembler</b></a>, <a href="index.html#refartifact132485"><b>trafo</b></a>, <a href="index.html#refartifact129157"><b>explicitplacement</b></a>, <a href="index.html#refartifact130309"><b>auto</b></a>, <a href="index.html#refartifact133637"><b>glrender</b></a>, <a href="index.html#refartifact132613"><b>link</b></a>, <a href="index.html#refartifact134405"><b>parameter</b></a>, <a href="index.html#refartifact131973"><b>renderengine</b></a>, <a href="index.html#refartifact130053"><b>allocation</b></a>, <a href="index.html#refartifact134021"><b>vframe</b></a>, <a href="index.html#refartifact130565"><b>toolfactory</b></a>, <a href="index.html#refartifact133381"><b>arender</b></a>, <a href="index.html#refartifact131845"><b>renderstate</b></a>, <a href="index.html#refartifact130181"><b>label</b></a>, <a href="index.html#refartifact134149"><b>glbuf</b></a>, <a href="index.html#refartifact132357"><b>procnode</b></a>, <a href="index.html#refartifact130949"><b>stateproxy</b></a>, <a href="index.html#refartifact132741"><b>hub</b></a>, <a href="index.html#refartifact131077"><b>buildable</b></a>, <a href="index.html#refartifact129285"><b>abstractmo</b></a>, <a href="index.html#refartifact131461"><b>nodecreatertool</b></a>, <a href="index.html#refartifact132869"><b>projector</b></a>, <a href="index.html#refartifact134661"><b>interpolator</b></a>, <a href="index.html#refartifact128645"><b>edl</b></a>, <a href="index.html#refartifact128773"><b>fixture</b></a>, <a href="index.html#refartifact133253"><b>glpipe</b></a>, <a href="index.html#refartifact133509"><b>vrender</b></a>, <a href="index.html#refartifact132229"><b>exitnode</b></a>, <a href="index.html#refartifact131717"><b>pathmanager</b></a>, <a href="index.html#refartifact128901"><b>track</b></a>, <a href="index.html#refartifact134533"><b>paramprovider</b></a>, <a href="index.html#refartifact132997"><b>mask</b></a>, <a href="index.html#refartifact128133"><b>main</b></a>, <a href="index.html#refartifact130693"><b>conmanager</b></a>, <a href="index.html#refartifact129413"><b>clip</b></a>, <a href="index.html#refartifact129669"><b>meta</b></a>, <a href="index.html#refartifact129797"><b>fixedlocation</b></a>, <a href="index.html#refartifact129925"><b>relativelocation</b></a>, <a href="index.html#refartifact128261"><b>mobject</b></a>, <a href="index.html#refartifact134277"><b>source</b></a>, <a href="index.html#refartifact133765"><b>frame</b></a>, <a href="index.html#refartifact129029"><b>placement</b></a>, <a href="index.html#refartifact128517"><b>sessionimpl</b></a>, <a href="index.html#refartifact130437"><b>builderfacade</b></a>, <a href="index.html#refartifact131589"><b>controllerfacade</b></a>, <a href="index.html#refartifact132101"><b>processor</b></a>, <a href="index.html#refartifact133125"><b>pluginadapter</b></a>, <a href="index.html#refartifact129541"><b>effect</b></a>, <a href="index.html#refartifact131205"><b>buildertool</b></a>, <a href="index.html#refartifact131333"><b>segmentationtool</b></a></p>
 <a name="refartifact128133"></a>
 <table><tr><td><div class="element">Artifact <b>main</b></div></td></tr></table>
 <p>Artifact <i>source</i></p>
@@ -1137,8 +1137,71 @@ reuse exiting Engine</pre></li></ul><p>Selection :</p><ul></ul><p>Transformation
 <p>GUI is here just a container to hold any entities considered to be User Interface related, which is not in focus for this Design draft<br /></p><a name="refpackage128517"></a>
 <h1 class ="package">5 Package CommonLib</h1>
 <div class="sub">
+<a name="refpackage131077"></a>
+<h2 class ="package">5.1 Package ConfigQuery</h2>
+<div class="sub">
+<a name="refcomponent view128261"></a>
+<h3 class ="view">5.1.1 Component View Query System overview</h3>
+<div class="sub">
+<a name="refcomponent diagram131589"></a>
+<p align="center"><img src="fig131589.png" alt="" /></p>
+ <p align="center"><b>components</b></p><p><br /></p><p><br /></p>
+<a name="refcomponent130565"></a>
+<table><tr><td><div class="element">Component <b>ConfigRules</b></div></td></tr></table>
+<p>A system for accessing various kinds of preconfigured objects by querying for capabilities.<br /></p>
+<a name="refcomponent130693"></a>
+<table><tr><td><div class="element">Component <b>Resolver</b></div></td></tr></table>
+<a name="refcomponent130821"></a>
+<table><tr><td><div class="element">Component <b>Rule Base</b></div></td></tr></table>
+<a name="refcomponent130949"></a>
+<table><tr><td><div class="element">Component <b>DefaultsManager</b></div></td></tr></table>
+</div>
+<a name="refclass view129157"></a>
+<h3 class ="view">5.1.2 Class View query</h3>
+<div class="sub">
+<a name="refclass diagram131461"></a>
+<p align="center"><img src="fig131461.png" alt="" /></p>
+ <p align="center"><b>Rules access</b></p><p><br /></p><p><br /></p>
+<table><tr><td><div class="element">Class <b><a href="class140549.html#refclass140549"><b>ConfigRules</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class140677.html#refclass140677"><b>QueryHandler</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class140805.html#refclass140805"><b>TypeHandler</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class140933.html#refclass140933"><b>ResolverBase</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class141061.html#refclass141061"><b>YAP_Prolog</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class141317.html#refclass141317"><b>TypeHandler&lt;Pipe&gt;</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class141445.html#refclass141445"><b>DefaultsManager</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class141573.html#refclass141573"><b>DefaultsRegistry</b></a></b></div></td></tr></table>
+</div>
+<a name="refuse case view128389"></a>
+<h3 class ="view">5.1.3 Use Case View query use</h3>
+<div class="sub">
+<a name="refuse case diagram131717"></a>
+<p align="center"><img src="fig131717.png" alt="" /></p>
+ <p align="center"><b>when to query</b></p><p><br /></p><p><br /></p>
+<a name="refuse case128517"></a>
+<h4 class ="usecase">5.1.3.1 Use Case create specific object</h4>
+<a name="refuse case128645"></a>
+<h4 class ="usecase">5.1.3.2 Use Case use "default" object</h4>
+<div class="sub">
+</div>
+<a name="refuse case128773"></a>
+<h4 class ="usecase">5.1.3.3 Use Case load object from session</h4>
+<a name="refuse case128901"></a>
+<h4 class ="usecase">5.1.3.4 Use Case add new object to session</h4>
+<table><tr><td><div class="element">Class <b><a href="class141701.html#refclass141701"><b>User</b></a></b></div></td></tr></table>
+<table><tr><td><div class="element">Class <b><a href="class141829.html#refclass141829"><b>Serializer</b></a></b></div></td></tr></table>
+<a name="refuse case129029"></a>
+<h4 class ="usecase">5.1.3.5 Use Case ConfigQuery</h4>
+<a name="refuse case129157"></a>
+<h4 class ="usecase">5.1.3.6 Use Case need sub object</h4>
+<a name="refcollaboration diagram131845"></a>
+<p align="center"><img src="fig131845.png" alt="" /></p>
+ <p align="center"><b>"default" object</b></p><p><br /></p><p><br /></p>
+<a name="refclass instance135941"></a>
+<table><tr><td><div class="element">Class instance  <b>predicate impl</div></td></tr></table><p>type :<a href="class140805.html#refclass140805"><b>TypeHandler</b></a></p></div>
+</div>
 <a name="refclass view128773"></a>
-<h2 class ="view">5.1 Class View error</h2>
+<h2 class ="view">5.2 Class View error</h2>
 <div class="sub">
 <a name="refclass diagram130181"></a>
 <p align="center"><img src="fig130181.png" alt="" /></p>
@@ -1152,7 +1215,7 @@ reuse exiting Engine</pre></li></ul><p>Selection :</p><ul></ul><p>Transformation
 <table><tr><td><div class="element">Class <b><a href="class136325.html#refclass136325"><b>std::exception</b></a></b></div></td></tr></table>
 </div>
 <a name="refclass view128645"></a>
-<h2 class ="view">5.2 Class View Service Components</h2>
+<h2 class ="view">5.3 Class View Service Components</h2>
 <div class="sub">
 <table><tr><td><div class="element">Class <b><a href="class140293.html#refclass140293"><b>Applicable</b></a></b></div></td></tr></table>
 <table><tr><td><div class="element">Class <b><a href="class140037.html#refclass140037"><b>Tool</b></a></b></div></td></tr></table>
@@ -1162,7 +1225,7 @@ reuse exiting Engine</pre></li></ul><p>Selection :</p><ul></ul><p>Transformation
 <table><tr><td><div class="element">Class <b><a href="class135429.html#refclass135429"><b>Appconfig</b></a></b></div></td></tr></table>
 </div>
 <a name="refclass view128138"></a>
-<h2 class ="view">5.3 Class View Posix Threads Abstraction</h2>
+<h2 class ="view">5.4 Class View Posix Threads Abstraction</h2>
 <p>C++ wrapers for pthreads<br /></p>
 <div class="sub">
 <table><tr><td><div class="element">Class <b><a href="class128138.html#refclass128138"><b>Thread</b></a></b></div></td></tr></table>
@@ -1170,7 +1233,7 @@ reuse exiting Engine</pre></li></ul><p>Selection :</p><ul></ul><p>Transformation
 <table><tr><td><div class="element">Class <b><a href="class128394.html#refclass128394"><b>Mutex</b></a></b></div></td></tr></table>
 </div>
 <a name="refclass view128266"></a>
-<h2 class ="view">5.4 Class View SmartPointers</h2>
+<h2 class ="view">5.5 Class View SmartPointers</h2>
 <div class="sub">
 <table><tr><td><div class="element">Class <b><a href="class128906.html#refclass128906"><b>SmartPointer</b></a></b></div></td></tr></table>
 </div>
diff --git a/doc/devel/uml/index_34.html b/doc/devel/uml/index_34.html
new file mode 100644
index 000000000..54f1d1d1f
--- /dev/null
+++ b/doc/devel/uml/index_34.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>"</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">"</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcollaboration diagram131845" target = "projectFrame"><b>"default" object</b></a></td><td>collaboration diagram</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/devel/uml/index_60.html b/doc/devel/uml/index_60.html
index a873c25b0..4909e634c 100644
--- a/doc/devel/uml/index_60.html
+++ b/doc/devel/uml/index_60.html
@@ -30,8 +30,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition129029" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130181" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131717" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131077" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130949" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#reftransition131077" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130053" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition128901" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reftransition130565" target = "projectFrame"><b>&lt;flow&gt;</b></a></td><td>transition</td><td></td></tr>
diff --git a/doc/devel/uml/index_65.html b/doc/devel/uml/index_65.html
index cb80221e6..3fce72879 100644
--- a/doc/devel/uml/index_65.html
+++ b/doc/devel/uml/index_65.html
@@ -23,6 +23,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128133" target = "projectFrame"><b>access File</b></a></td><td>use case</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity final129157" target = "projectFrame"><b>activity final</b></a></td><td>activity final</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity final128901" target = "projectFrame"><b>activity final</b></a></td><td>activity final</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128901" target = "projectFrame"><b>add new object to session</b></a></td><td>use case</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class133381.html#refclass133381" target = "projectFrame"><b>AFrame</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact133893" target = "projectFrame"><b>aframe</b></a></td><td>artifact</td><td>a buffer and render process holding a Audio frame</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact130053" target = "projectFrame"><b>allocation</b></a></td><td>artifact</td><td></td></tr>
@@ -55,8 +56,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131845" target = "projectFrame"><b>aud_a</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131205" target = "projectFrame"><b>audio</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130821" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128389" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128901" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128389" target = "projectFrame"><b>audio1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact130309" target = "projectFrame"><b>auto</b></a></td><td>artifact</td><td>Media Object holding automation data</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129925.html#refclass129925" target = "projectFrame"><b>Auto</b></a></td><td>class</td><td>Automation data for some parameter (i.e. a time varying function)</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram129669" target = "projectFrame"><b>Automation Entities</b></a></td><td>class diagram</td><td></td></tr>
diff --git a/doc/devel/uml/index_67.html b/doc/devel/uml/index_67.html
index 93dc372e2..08c04b765 100644
--- a/doc/devel/uml/index_67.html
+++ b/doc/devel/uml/index_67.html
@@ -23,42 +23,42 @@
 <tr bgcolor=#f0f0f0><td><a href="class137221.html#refclass137221" target = "projectFrame"><b>Category</b></a></td><td>class</td><td>tree like classification of Assets</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact135941" target = "projectFrame"><b>category</b></a></td><td>artifact</td><td>tree like classification of Assets</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130309" target = "projectFrame"><b>cause</b></a></td><td>attribute</td><td>a copy of the first exception encountered in this exception chain</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134277" target = "projectFrame"><b>chain</b></a></td><td>operation</td><td>create and add another Placement for this media object, thus increasingly constraining the (possible) position of this object.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation145413" target = "projectFrame"><b>chain</b></a></td><td>relation</td><td>Chain of additional Placements further constraining the position of this MObject</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134277" target = "projectFrame"><b>chain</b></a></td><td>operation</td><td>create and add another Placement for this media object, thus increasingly constraining the (possible) position of this object.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation129633" target = "projectFrame"><b>checked_in</b></a></td><td>relation</td><td>checked_in objects are subject of cache aging and must be not in use</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation129290" target = "projectFrame"><b>checked_out</b></a></td><td>relation</td><td>this list keeps all mappings which are in use, and thus prevents them from Cache aging</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134917" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134789" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135557" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134661" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135301" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135045" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134917" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135429" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134789" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135557" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135685" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134661" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135173" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135813" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131589" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132229" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129797" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128133" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130693" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128005" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128261" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129541" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130565" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132357" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130437" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128261" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133509" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132229" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128133" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132485" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129029" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129285" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129541" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132357" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130309" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129797" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130181" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130053" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133509" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129029" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130693" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129285" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131589" target = "projectFrame"><b>class instance</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation133765" target = "projectFrame"><b>clear</b></a></td><td>operation</td><td>clear current session contents <br />without resetting overall session config.<br />Afterwards, the session will contain only one <br />empty EDL, while all Assets are retained.<br /></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class137349.html#refclass137349" target = "projectFrame"><b>Clip</b></a></td><td>class</td><td>bookkeeping (asset) view of a media clip.</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129413" target = "projectFrame"><b>clip</b></a></td><td>artifact</td><td>a Media Clip</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact136325" target = "projectFrame"><b>clip</b></a></td><td>artifact</td><td>bookkeeping (asset) view of a media clip.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129413" target = "projectFrame"><b>clip</b></a></td><td>artifact</td><td>a Media Clip</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128901.html#refclass128901" target = "projectFrame"><b>Clip</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128901" target = "projectFrame"><b>clips</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class137861.html#refclass137861" target = "projectFrame"><b>Codec</b></a></td><td>class</td><td>description of some media data decoder or encoder facility</td></tr>
@@ -71,6 +71,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128517" target = "projectFrame"><b>CommonLib</b></a></td><td>package</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity object128517" target = "projectFrame"><b>complete Render Engine</b></a></td><td>activity object</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation143493" target = "projectFrame"><b>components</b></a></td><td>relation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent diagram131589" target = "projectFrame"><b>components</b></a></td><td>component diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact138501" target = "projectFrame"><b>compoundclip</b></a></td><td>artifact</td><td>compound of several clips (multichannel)</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138629.html#refclass138629" target = "projectFrame"><b>CompoundClip</b></a></td><td>class</td><td>Clip MObject which is actually a compound of several elementary clips,<br />e.g. the several streams found within multichannels media.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138501.html#refclass138501" target = "projectFrame"><b>CompoundMedia</b></a></td><td>class</td><td>compound of several elementary media tracks,<br />e.g. the individual media streams found in one media file</td></tr>
@@ -78,6 +79,10 @@
 <tr bgcolor=#f0f0f0><td><a href="class128266.html#refclass128266" target = "projectFrame"><b>Condition</b></a></td><td>class</td><td>I provided a reworked Condition class in my Cinelerra2 repository</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135813.html#refclass135813" target = "projectFrame"><b>Config</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case view128261" target = "projectFrame"><b>config examples</b></a></td><td>use case view</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage131077" target = "projectFrame"><b>ConfigQuery</b></a></td><td>package</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case129029" target = "projectFrame"><b>ConfigQuery</b></a></td><td>use case</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140549.html#refclass140549" target = "projectFrame"><b>ConfigRules</b></a></td><td>class</td><td>public acces point for running Config Queries</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent130565" target = "projectFrame"><b>ConfigRules</b></a></td><td>component</td><td>A system for accessing various kinds of preconfigured objects by querying for capabilities.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation128773" target = "projectFrame"><b>configure</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity128133" target = "projectFrame"><b>configure Render</b></a></td><td>activity</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refopaque activity action128645" target = "projectFrame"><b>configure Tools</b></a></td><td>opaque activity action</td><td></td></tr>
@@ -88,14 +93,15 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact139397" target = "projectFrame"><b>constraint</b></a></td><td>artifact</td><td>LocatingPin representing an directive by the user that<br />must not be violated</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130181.html#refclass130181" target = "projectFrame"><b>Constraint</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128261" target = "projectFrame"><b>Controller</b></a></td><td>component</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130693" target = "projectFrame"><b>controller</b></a></td><td>package</td><td>sourcecode package<br /><br />The Processing and Render Controller,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129029" target = "projectFrame"><b>Controller</b></a></td><td>package</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130693" target = "projectFrame"><b>controller</b></a></td><td>package</td><td>sourcecode package<br /><br />The Processing and Render Controller,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128645" target = "projectFrame"><b>Controller Entities</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128389" target = "projectFrame"><b>Controller Workings</b></a></td><td>class view</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130309.html#refclass130309" target = "projectFrame"><b>ControllerFacade</b></a></td><td>class</td><td>Provides unified access to the Proc-Subsystem Controller. Especially, this Facade class provides the functions to get a render engine to carry out actual renderings.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact131589" target = "projectFrame"><b>controllerfacade</b></a></td><td>artifact</td><td>Facade and service access point for the Proc Layer Controller</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent129541" target = "projectFrame"><b>ControllerFacade</b></a></td><td>component</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refopaque activity action128901" target = "projectFrame"><b>create ProcNode</b></a></td><td>opaque activity action</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128517" target = "projectFrame"><b>create specific object</b></a></td><td>use case</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation133253" target = "projectFrame"><b>createClip</b></a></td><td>operation</td><td>create a (possibly compound) Clip refering to this media, ready to be added to the EDL.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation133509" target = "projectFrame"><b>currEDL</b></a></td><td>operation</td><td>The EDL currently in focus. In most cases, Session and EDL are almost the same, just EDL emphasizes the collection aspect. But generally (for larger editing projects) one Session can contain several EDLs, which may even be nested. At any given time, only one of these EDLs has focus and recieves the editing commands.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation144773" target = "projectFrame"><b>current</b></a></td><td>relation</td><td>Standard access path to get at the current session via the Session Manager, which acts as a "PImpl" smart pointer</td></tr>
diff --git a/doc/devel/uml/index_68.html b/doc/devel/uml/index_68.html
index 68da1dfbd..90bc7ba4d 100644
--- a/doc/devel/uml/index_68.html
+++ b/doc/devel/uml/index_68.html
@@ -22,14 +22,18 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation136965" target = "projectFrame"><b>datasrc</b></a></td><td>relation</td><td>The predecessor in a processing pipeline, i.e. a source to get data to be processed</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class138373.html#refclass138373" target = "projectFrame"><b>DB</b></a></td><td>class</td><td>Implementation of the registry holding all Asset instances known to the Asset Manager subsystem. As of 8/2007 implemented by a hashtable.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact137861" target = "projectFrame"><b>db</b></a></td><td>artifact</td><td>registry holding known Asset instances.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refrelation150917" target = "projectFrame"><b>defaults</b></a></td><td>relation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141445.html#refclass141445" target = "projectFrame"><b>DefaultsManager</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent130949" target = "projectFrame"><b>DefaultsManager</b></a></td><td>component</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141573.html#refclass141573" target = "projectFrame"><b>DefaultsRegistry</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refopaque activity action128773" target = "projectFrame"><b>define segment</b></a></td><td>opaque activity action</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128437" target = "projectFrame"><b>descriptor</b></a></td><td>relation</td><td>type of this frame</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128481" target = "projectFrame"><b>descriptor</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128138" target = "projectFrame"><b>design</b></a></td><td>package</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128005" target = "projectFrame"><b>design</b></a></td><td>package</td><td>All things concering the big picture.<br />Not a real code package, rather a container for design drafts, specifications, decisions.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128261" target = "projectFrame"><b>detect Channels</b></a></td><td>use case</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refopaque activity action128389" target = "projectFrame"><b>determine Render Params</b></a></td><td>opaque activity action</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refexpansion region128005" target = "projectFrame"><b>determine Render Params</b></a></td><td>expansion region</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refopaque activity action128389" target = "projectFrame"><b>determine Render Params</b></a></td><td>opaque activity action</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132613" target = "projectFrame"><b>devnull</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128773" target = "projectFrame"><b>Dispatcher</b></a></td><td>component</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134917" target = "projectFrame"><b>dispatchOp</b></a></td><td>operation</td><td></td></tr>
diff --git a/doc/devel/uml/index_69.html b/doc/devel/uml/index_69.html
index 1f6fd3f19..6c17d406d 100644
--- a/doc/devel/uml/index_69.html
+++ b/doc/devel/uml/index_69.html
@@ -24,8 +24,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refobject diagram128901" target = "projectFrame"><b>EDL Example2</b></a></td><td>object diagram</td><td>More complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128005" target = "projectFrame"><b>edls</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class137733.html#refclass137733" target = "projectFrame"><b>Effect</b></a></td><td>class</td><td>Effect or media processing component</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact137221" target = "projectFrame"><b>effect</b></a></td><td>artifact</td><td>Effect or media processing component</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129541" target = "projectFrame"><b>effect</b></a></td><td>artifact</td><td>EDL representation of a pluggable and automatable effect.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact137221" target = "projectFrame"><b>effect</b></a></td><td>artifact</td><td>Effect or media processing component</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129029.html#refclass129029" target = "projectFrame"><b>Effect</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation138885" target = "projectFrame"><b>elements</b></a></td><td>relation</td><td>relevant MObjects comprising this segment. TODO: actually necessary??</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation132997" target = "projectFrame"><b>enable</b></a></td><td>operation</td><td>change the enabled status of this asset. Note the corresponding #isActive predicate may depend on the enablement status of parent assets as well</td></tr>
diff --git a/doc/devel/uml/index_70.html b/doc/devel/uml/index_70.html
index b36d60aff..78b986b1b 100644
--- a/doc/devel/uml/index_70.html
+++ b/doc/devel/uml/index_70.html
@@ -29,12 +29,13 @@
 <tr bgcolor=#f0f0f0><td><a href="class129333.html#refclass129333" target = "projectFrame"><b>FileProvider</b></a></td><td>class</td><td>This is the Factory for Files, whenever something wants to use some file (or temporary storage), This Factory will hand out some smart/shared pointer to a File object which will be used to retrieve Frames.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128778.html#refclass128778" target = "projectFrame"><b>FileReference</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation129034" target = "projectFrame"><b>files</b></a></td><td>relation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation135045" target = "projectFrame"><b>find</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129797" target = "projectFrame"><b>fixedlocation</b></a></td><td>artifact</td><td>implements fixed placement of a MObject</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129285.html#refclass129285" target = "projectFrame"><b>FixedLocation</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity object128005" target = "projectFrame"><b>Fixture</b></a></td><td>activity object</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact128773" target = "projectFrame"><b>fixture</b></a></td><td>artifact</td><td>the (low level) representation of the EDL with concrete placement data</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class128261.html#refclass128261" target = "projectFrame"><b>Fixture</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128517" target = "projectFrame"><b>Fixture</b></a></td><td>component</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class128261.html#refclass128261" target = "projectFrame"><b>Fixture</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#reffork activity node129029" target = "projectFrame"><b>fork activity node</b></a></td><td>fork activity node</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128821.html#refclass128821" target = "projectFrame"><b>Frame</b></a></td><td>class</td><td>Frames are just a low level lump of continous memory, most parts are opaque. Frames are memory sensitive, they will be small constant sized structures which can be efficently managed in a pool.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refnode128645" target = "projectFrame"><b>Frame</b></a></td><td>node</td><td></td></tr>
diff --git a/doc/devel/uml/index_72.html b/doc/devel/uml/index_72.html
index bf8262c8c..0abaaac68 100644
--- a/doc/devel/uml/index_72.html
+++ b/doc/devel/uml/index_72.html
@@ -24,8 +24,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation133381" target = "projectFrame"><b>howtoProc</b></a></td><td>operation</td><td>@return descriptor how to build a render pipeline corresponding to this media</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class132101.html#refclass132101" target = "projectFrame"><b>Hub</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact132741" target = "projectFrame"><b>hub</b></a></td><td>artifact</td><td>special ProcNode used to build data distributing connections</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133253" target = "projectFrame"><b>HUE</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133893" target = "projectFrame"><b>HUE</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133253" target = "projectFrame"><b>HUE</b></a></td><td>class instance</td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/index_73.html b/doc/devel/uml/index_73.html
index 27e37a604..798945020 100644
--- a/doc/devel/uml/index_73.html
+++ b/doc/devel/uml/index_73.html
@@ -20,9 +20,9 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130437" target = "projectFrame"><b>id</b></a></td><td>attribute</td><td>Asset primary key.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128309" target = "projectFrame"><b>In Memory Database</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity action pin128133" target = "projectFrame"><b>inFixture</b></a></td><td>activity action pin</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134149" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132869" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131461" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134149" target = "projectFrame"><b>input</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation131461" target = "projectFrame"><b>instance</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation143621" target = "projectFrame"><b>instructions</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view129029" target = "projectFrame"><b>Interface</b></a></td><td>class view</td><td></td></tr>
diff --git a/doc/devel/uml/index_76.html b/doc/devel/uml/index_76.html
index 0b4ef97db..75cbabe50 100644
--- a/doc/devel/uml/index_76.html
+++ b/doc/devel/uml/index_76.html
@@ -25,6 +25,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact132613" target = "projectFrame"><b>link</b></a></td><td>artifact</td><td>forwarding, adapting or connecting ProcNode</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134021" target = "projectFrame"><b>load</b></a></td><td>operation</td><td>replace the current session by a new<br />session loaded from serialized state.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128005" target = "projectFrame"><b>load Media</b></a></td><td>use case</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128773" target = "projectFrame"><b>load object from session</b></a></td><td>use case</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact139013" target = "projectFrame"><b>locatingpin</b></a></td><td>artifact</td><td>Chaining and constraining the Placement of a Media Object</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139909.html#refclass139909" target = "projectFrame"><b>LocatingPin</b></a></td><td>class</td><td>An element with value semantics, which actually implements the placement of some MObject by positioning it in some way.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128522.html#refclass128522" target = "projectFrame"><b>Lock</b></a></td><td>class</td><td></td></tr>
diff --git a/doc/devel/uml/index_77.html b/doc/devel/uml/index_77.html
index 3e0b915cc..e6d8e8031 100644
--- a/doc/devel/uml/index_77.html
+++ b/doc/devel/uml/index_77.html
@@ -18,6 +18,7 @@
 <table>
 <tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact128133" target = "projectFrame"><b>main</b></a></td><td>artifact</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation135173" target = "projectFrame"><b>make</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128522" target = "projectFrame"><b>mapping</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation128609" target = "projectFrame"><b>mappings</b></a></td><td>relation</td><td>weak pointers</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class132357.html#refclass132357" target = "projectFrame"><b>Mask</b></a></td><td>class</td><td></td></tr>
diff --git a/doc/devel/uml/index_78.html b/doc/devel/uml/index_78.html
index eeaf4b78d..1cf51971d 100644
--- a/doc/devel/uml/index_78.html
+++ b/doc/devel/uml/index_78.html
@@ -18,6 +18,7 @@
 <table>
 <tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130565" target = "projectFrame"><b>name</b></a></td><td>attribute</td><td>element ID, comprehensible but sanitized. The tuple (category, name, org) is unique.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case129157" target = "projectFrame"><b>need sub object</b></a></td><td>use case</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation146053" target = "projectFrame"><b>next</b></a></td><td>relation</td><td>next additional LocatingPin, if any</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact131461" target = "projectFrame"><b>nodecreatertool</b></a></td><td>artifact</td><td>central Tool implementing the Renderengine building</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134405.html#refclass134405" target = "projectFrame"><b>NodeCreatorTool</b></a></td><td>class</td><td>This Tool implementation plays the central role in the buld process: given a MObject from Session, it is able to attach ProcNodes to the render engine under construction such as to reflect the properties of the MObject in the actual render.</td></tr>
diff --git a/doc/devel/uml/index_79.html b/doc/devel/uml/index_79.html
index d1fdc83c0..4ac4c3b33 100644
--- a/doc/devel/uml/index_79.html
+++ b/doc/devel/uml/index_79.html
@@ -19,9 +19,9 @@
 <tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute129029" target = "projectFrame"><b>offset</b></a></td><td>attribute</td><td>Offset the actual position by this (time) value relative to the anchor point. TODO: Representation?</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130821" target = "projectFrame"><b>org</b></a></td><td>attribute</td><td>origin or authorship id. Can be a project abbreviation, a package id or just the authors nickname or UID. This allows for the compnent name to be more generic (e.g. "blur"). Default for all assets provided by the core Lumiera codebase is "lumi".</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131333" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134405" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133125" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131333" target = "projectFrame"><b>ouput</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation147973" target = "projectFrame"><b>outPort</b></a></td><td>relation</td><td>the Port this MObject wants to be conected to</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation132613" target = "projectFrame"><b>output</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent diagram128005" target = "projectFrame"><b>Overview</b></a></td><td>component diagram</td><td>This drawing shows the top level compoents and relations</td></tr>
diff --git a/doc/devel/uml/index_80.html b/doc/devel/uml/index_80.html
index 2b01f816d..ba34ae763 100644
--- a/doc/devel/uml/index_80.html
+++ b/doc/devel/uml/index_80.html
@@ -40,6 +40,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refnode128517" target = "projectFrame"><b>pnode</b></a></td><td>node</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute131461" target = "projectFrame"><b>point</b></a></td><td>attribute</td><td>identifying the point where the nodes should be attached</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128138" target = "projectFrame"><b>Posix Threads Abstraction</b></a></td><td>class view</td><td>C++ wrapers for pthreads</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance135941" target = "projectFrame"><b>predicate impl</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129077.html#refclass129077" target = "projectFrame"><b>Prefetch</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class137605.html#refclass137605" target = "projectFrame"><b>Preview</b></a></td><td>class</td><td>alternative version of the media data, probably with lower resolution</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact136965" target = "projectFrame"><b>preview</b></a></td><td>artifact</td><td>alternative version of the media data, probably with lower resolution</td></tr>
diff --git a/doc/devel/uml/index_81.html b/doc/devel/uml/index_81.html
new file mode 100644
index 000000000..5a521bd2f
--- /dev/null
+++ b/doc/devel/uml/index_81.html
@@ -0,0 +1,27 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Q</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Q</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass view129157" target = "projectFrame"><b>query</b></a></td><td>class view</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent view128261" target = "projectFrame"><b>Query System overview</b></a></td><td>component view</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case view128389" target = "projectFrame"><b>query use</b></a></td><td>use case view</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140677.html#refclass140677" target = "projectFrame"><b>QueryHandler</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141189.html#refclass141189" target = "projectFrame"><b>QueryHandlerImpl</b></a></td><td>class</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/devel/uml/index_82.html b/doc/devel/uml/index_82.html
index a76e8f590..1bade53e8 100644
--- a/doc/devel/uml/index_82.html
+++ b/doc/devel/uml/index_82.html
@@ -22,8 +22,8 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation142085" target = "projectFrame"><b>registry</b></a></td><td>relation</td><td>@internal Table or DB holding all registered asset instances.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact129925" target = "projectFrame"><b>relativelocation</b></a></td><td>artifact</td><td>Placement implemnetaion providing various ways of attaching a MObject to another one</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129413.html#refclass129413" target = "projectFrame"><b>RelativeLocation</b></a></td><td>class</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refattribute128133" target = "projectFrame"><b>relType</b></a></td><td>attribute</td><td>the kind of relation denoted by this Placement</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class133893.html#refclass133893" target = "projectFrame"><b>RelType</b></a></td><td>class</td><td>the possible kinds of RelativePlacements</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refattribute128133" target = "projectFrame"><b>relType</b></a></td><td>attribute</td><td>the kind of relation denoted by this Placement</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation132741" target = "projectFrame"><b>remove</b></a></td><td>operation</td><td>remove the given asset &lt;i&gt;together with all its dependants&lt;/i&gt; from the internal DB</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128389" target = "projectFrame"><b>Render Entities</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity parameter128005" target = "projectFrame"><b>Render Request</b></a></td><td>activity parameter</td><td></td></tr>
@@ -38,7 +38,13 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute128773" target = "projectFrame"><b>repr</b></a></td><td>attribute</td><td>human readable representation of the condition characterizing this allocaton, e.g. "t &gt;= 10"</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation133893" target = "projectFrame"><b>reset</b></a></td><td>operation</td><td>reset all session config and <br />start with a pristine default session.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation128005" target = "projectFrame"><b>resolve</b></a></td><td>operation</td><td>create an actual (explicit) placement while trying to satisfy the network of adjacent objects and placements.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation135301" target = "projectFrame"><b>resolve</b></a></td><td>operation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation135429" target = "projectFrame"><b>resolve</b></a></td><td>operation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent130693" target = "projectFrame"><b>Resolver</b></a></td><td>component</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140933.html#refclass140933" target = "projectFrame"><b>ResolverBase</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation131973" target = "projectFrame"><b>rootCause</b></a></td><td>operation</td><td>If this exception was caused by a chain of further exceptions,<br />return the first one registered in this throw sequence.<br />This works only, if every exceptions thrown as a consequence<br />of another exception is propperly constructed by passing<br />the original exception to the constructor</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent130821" target = "projectFrame"><b>Rule Base</b></a></td><td>component</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram131461" target = "projectFrame"><b>Rules access</b></a></td><td>class diagram</td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/index_83.html b/doc/devel/uml/index_83.html
index 18c49405b..e2f2fcea3 100644
--- a/doc/devel/uml/index_83.html
+++ b/doc/devel/uml/index_83.html
@@ -28,11 +28,12 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity object128389" target = "projectFrame"><b>segments</b></a></td><td>activity object</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refactivity object128133" target = "projectFrame"><b>segments</b></a></td><td>activity object</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation139013" target = "projectFrame"><b>segments</b></a></td><td>relation</td><td>the partitioning of the Timeline to be created by this tool.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141829.html#refclass141829" target = "projectFrame"><b>Serializer</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128645" target = "projectFrame"><b>Service Components</b></a></td><td>class view</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refcomponent128133" target = "projectFrame"><b>Session</b></a></td><td>component</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact138757" target = "projectFrame"><b>session</b></a></td><td>artifact</td><td>Interface: the session edited by the user</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130437" target = "projectFrame"><b>session</b></a></td><td>package</td><td>sourcecode package<br /><br />Everything concerning the EDL and Session, within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass view128005" target = "projectFrame"><b>Session</b></a></td><td>class view</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130437" target = "projectFrame"><b>session</b></a></td><td>package</td><td>sourcecode package<br /><br />Everything concerning the EDL and Session, within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139653.html#refclass139653" target = "projectFrame"><b>Session</b></a></td><td>class</td><td>Primary Interface for all editing tasks.<br />The session contains defaults, all the assets being edited, and a set of EDL with the individual MObjects to be manipulated and rendered.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128133" target = "projectFrame"><b>Session structure</b></a></td><td>class diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact128517" target = "projectFrame"><b>sessionimpl</b></a></td><td>artifact</td><td>holds the complete session data to be edited by the user</td></tr>
diff --git a/doc/devel/uml/index_84.html b/doc/devel/uml/index_84.html
index 692cb2cac..14d928057 100644
--- a/doc/devel/uml/index_84.html
+++ b/doc/devel/uml/index_84.html
@@ -34,21 +34,23 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation147333" target = "projectFrame"><b>track</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute128389" target = "projectFrame"><b>track</b></a></td><td>attribute</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation147589" target = "projectFrame"><b>track</b></a></td><td>relation</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact137477" target = "projectFrame"><b>track</b></a></td><td>artifact</td><td>structural asset holding the configuration of a track in the EDL</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact128901" target = "projectFrame"><b>track</b></a></td><td>artifact</td><td>A grouping device within the EDL. The corresponding Placement<br />by which this Track object is refered defines fallback placing<br />properties to be used by all objects placed on this track in<br />case they don't specify more concrete placements.<br />Typically, tracks are used do make default Port connections,<br />define a layer or pan for sound and for for disabling groups<br />of clips. Note tracks are grouped in a tree like fashion.<br /></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refartifact137477" target = "projectFrame"><b>track</b></a></td><td>artifact</td><td>structural asset holding the configuration of a track in the EDL</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128389.html#refclass128389" target = "projectFrame"><b>Track</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation142341" target = "projectFrame"><b>tracks</b></a></td><td>relation</td><td>elementary media assets comprising this compound</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class131845.html#refclass131845" target = "projectFrame"><b>Trafo</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact132485" target = "projectFrame"><b>trafo</b></a></td><td>artifact</td><td>transforming processing Node </td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation134405" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation129797" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td>This operation is to be overloaded for the specific MObject subclasses to be treated.</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130309" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130693" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130565" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130437" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130309" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation129925" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130053" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation130181" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refoperation129925" target = "projectFrame"><b>treat</b></a></td><td>operation</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140805.html#refclass140805" target = "projectFrame"><b>TypeHandler</b></a></td><td>class</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141317.html#refclass141317" target = "projectFrame"><b>TypeHandler&lt;Pipe&gt;</b></a></td><td>class</td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/index_85.html b/doc/devel/uml/index_85.html
index 6075e15d1..dafc717cb 100644
--- a/doc/devel/uml/index_85.html
+++ b/doc/devel/uml/index_85.html
@@ -20,7 +20,9 @@
 <tr bgcolor=#f0f0f0><td><a href="class137477.html#refclass137477" target = "projectFrame"><b>Unknown</b></a></td><td>class</td><td>placeholder for unknown or unavailable media source</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact137093" target = "projectFrame"><b>unknown</b></a></td><td>artifact</td><td>placeholder for unknown or unavailable media source</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case view128133" target = "projectFrame"><b>usage</b></a></td><td>use case view</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128645" target = "projectFrame"><b>use "default" object</b></a></td><td>use case</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation128010" target = "projectFrame"><b>useFile</b></a></td><td>operation</td><td>Announces that the application intends to use this file with mode (READ|WRITE|READWRITE)</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141701.html#refclass141701" target = "projectFrame"><b>User</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation128138" target = "projectFrame"><b>useTemporaryStorage</b></a></td><td>operation</td><td>Provides a pool for interminate frames</td></tr>
 </table>
 </body>
diff --git a/doc/devel/uml/index_86.html b/doc/devel/uml/index_86.html
index f75b93690..e3c5f01a9 100644
--- a/doc/devel/uml/index_86.html
+++ b/doc/devel/uml/index_86.html
@@ -20,23 +20,23 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refattribute130949" target = "projectFrame"><b>version</b></a></td><td>attribute</td><td>version number of the thing or concept represented by this asset. Of each unique tuple (name, category, org) there will be only one version in the whole system. Version 0 is reserved for internal purposes. Versions are considered to be ordered, and any higher version is supposed to be fully backwards compatible to all previous versions.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class133509.html#refclass133509" target = "projectFrame"><b>VFrame</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact134021" target = "projectFrame"><b>vframe</b></a></td><td>artifact</td><td>a buffer and render process holding a Video frame</td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131973" target = "projectFrame"><b>vid1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133381" target = "projectFrame"><b>vid1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131717" target = "projectFrame"><b>vid_a</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134021" target = "projectFrame"><b>vid_a</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129413" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131973" target = "projectFrame"><b>vid1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129925" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129413" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134021" target = "projectFrame"><b>vid_a</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131717" target = "projectFrame"><b>vid_a</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128645" target = "projectFrame"><b>vid_A</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134533" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131077" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133765" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132741" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance131077" target = "projectFrame"><b>video</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130949" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance129157" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance134277" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance132997" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128517" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance130949" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance133637" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass instance128517" target = "projectFrame"><b>video1</b></a></td><td>class instance</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class140165.html#refclass140165" target = "projectFrame"><b>Visitable</b></a></td><td>class</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130949" target = "projectFrame"><b>visitor</b></a></td><td>package</td><td>sub-namespace for visitor library implementation</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact139141" target = "projectFrame"><b>visitor</b></a></td><td>artifact</td><td>Acyclic Visitor library</td></tr>
diff --git a/doc/devel/uml/index_87.html b/doc/devel/uml/index_87.html
index 748f57b37..bd2bf3399 100644
--- a/doc/devel/uml/index_87.html
+++ b/doc/devel/uml/index_87.html
@@ -19,6 +19,7 @@
 <tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation131845" target = "projectFrame"><b>what</b></a></td><td>operation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refoperation131717" target = "projectFrame"><b>what</b></a></td><td>operation</td><td>the base class of all exceptions thrown by the standard library</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case diagram131717" target = "projectFrame"><b>when to query</b></a></td><td>use case diagram</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refrelation148229" target = "projectFrame"><b>wiringTemplate</b></a></td><td>relation</td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refartifact139269" target = "projectFrame"><b>wish</b></a></td><td>artifact</td><td>LocatingPin representing a low-priority directive by the user,<br />to be fulfilled only if possible (and after satisfying the<br />more important LocatingPins)</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class130053.html#refclass130053" target = "projectFrame"><b>Wish</b></a></td><td>class</td><td></td></tr>
diff --git a/doc/devel/uml/index_89.html b/doc/devel/uml/index_89.html
new file mode 100644
index 000000000..bb8528187
--- /dev/null
+++ b/doc/devel/uml/index_89.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Y</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Y</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141061.html#refclass141061" target = "projectFrame"><b>YAP_Prolog</b></a></td><td>class</td><td></td></tr>
+</table>
+</body>
+</html>
diff --git a/doc/devel/uml/navig.html b/doc/devel/uml/navig.html
index 74b812388..fd08b1b7d 100644
--- a/doc/devel/uml/navig.html
+++ b/doc/devel/uml/navig.html
@@ -12,6 +12,6 @@
 <p><a href="index.html" target = "projectFrame"><b> -Top- </b></a><a href="classes.html" target = "projectFrame"><b> -Classes- </b></a><a href="public_operations.html" target = "projectFrame"><b> -Public Operations- </b></a><a href="public_properties.html" target = "projectFrame"><b> -Public properties- </b></a><a href="packages.html" target = "projectFrame"><b> -Packages- </b></a><a href="usecases.html" target = "projectFrame"><b> -Use Cases- </b></a><a href="activities.html" target = "projectFrame"><b> -Activities- </b></a><a href="classdiagrams.html" target = "projectFrame"><b> -Class Diagrams- </b></a><a href="objectdiagrams.html" target = "projectFrame"><b> -Object Diagrams- </b></a><a href="activitydiagrams.html" target = "projectFrame"><b> -Activity Diagrams- </b></a><a href="usecasediagrams.html" target = "projectFrame"><b> -Use Case Diagrams- </b></a><a href="collaborationdiagrams.html" target = "projectFrame"><b> -Collaboration Diagrams- </b></a><a href="componentdiagrams.html" target = "projectFrame"><b> -Component Diagrams- </b></a><a href="deploymentdiagrams.html" target = "projectFrame"><b> -Deployment Diagrams- </b></a></p>
 <p>
 </p>
-<p><a href="index_60.html" target = "projectFrame"><b> &lt; </b></a><a href="index_65.html" target = "projectFrame"><b> A </b></a><a href="index_66.html" target = "projectFrame"><b> B </b></a><a href="index_67.html" target = "projectFrame"><b> C </b></a><a href="index_68.html" target = "projectFrame"><b> D </b></a><a href="index_69.html" target = "projectFrame"><b> E </b></a><a href="index_70.html" target = "projectFrame"><b> F </b></a><a href="index_71.html" target = "projectFrame"><b> G </b></a><a href="index_72.html" target = "projectFrame"><b> H </b></a><a href="index_73.html" target = "projectFrame"><b> I </b></a><a href="index_75.html" target = "projectFrame"><b> K </b></a><a href="index_76.html" target = "projectFrame"><b> L </b></a><a href="index_77.html" target = "projectFrame"><b> M </b></a><a href="index_78.html" target = "projectFrame"><b> N </b></a><a href="index_79.html" target = "projectFrame"><b> O </b></a><a href="index_80.html" target = "projectFrame"><b> P </b></a><a href="index_82.html" target = "projectFrame"><b> R </b></a><a href="index_83.html" target = "projectFrame"><b> S </b></a><a href="index_84.html" target = "projectFrame"><b> T </b></a><a href="index_85.html" target = "projectFrame"><b> U </b></a><a href="index_86.html" target = "projectFrame"><b> V </b></a><a href="index_87.html" target = "projectFrame"><b> W </b></a><a href="index_126.html" target = "projectFrame"><b> ~ </b></a></p>
+<p><a href="index_34.html" target = "projectFrame"><b> " </b></a><a href="index_60.html" target = "projectFrame"><b> &lt; </b></a><a href="index_65.html" target = "projectFrame"><b> A </b></a><a href="index_66.html" target = "projectFrame"><b> B </b></a><a href="index_67.html" target = "projectFrame"><b> C </b></a><a href="index_68.html" target = "projectFrame"><b> D </b></a><a href="index_69.html" target = "projectFrame"><b> E </b></a><a href="index_70.html" target = "projectFrame"><b> F </b></a><a href="index_71.html" target = "projectFrame"><b> G </b></a><a href="index_72.html" target = "projectFrame"><b> H </b></a><a href="index_73.html" target = "projectFrame"><b> I </b></a><a href="index_75.html" target = "projectFrame"><b> K </b></a><a href="index_76.html" target = "projectFrame"><b> L </b></a><a href="index_77.html" target = "projectFrame"><b> M </b></a><a href="index_78.html" target = "projectFrame"><b> N </b></a><a href="index_79.html" target = "projectFrame"><b> O </b></a><a href="index_80.html" target = "projectFrame"><b> P </b></a><a href="index_81.html" target = "projectFrame"><b> Q </b></a><a href="index_82.html" target = "projectFrame"><b> R </b></a><a href="index_83.html" target = "projectFrame"><b> S </b></a><a href="index_84.html" target = "projectFrame"><b> T </b></a><a href="index_85.html" target = "projectFrame"><b> U </b></a><a href="index_86.html" target = "projectFrame"><b> V </b></a><a href="index_87.html" target = "projectFrame"><b> W </b></a><a href="index_89.html" target = "projectFrame"><b> Y </b></a><a href="index_126.html" target = "projectFrame"><b> ~ </b></a></p>
 </body>
 </html>
diff --git a/doc/devel/uml/packages.html b/doc/devel/uml/packages.html
index c9321815b..49c0f4f80 100644
--- a/doc/devel/uml/packages.html
+++ b/doc/devel/uml/packages.html
@@ -25,6 +25,7 @@
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128645" target = "projectFrame"><b>codegen</b></a></td><td></td><td>This package is used to organize code generation by BOUML. It is considered useless after having generated the initial code skeleton.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129413" target = "projectFrame"><b>common</b></a></td><td>src</td><td>sourcecode package<br /><br />Common library and helper classes</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128517" target = "projectFrame"><b>CommonLib</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refpackage131077" target = "projectFrame"><b>ConfigQuery</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage129029" target = "projectFrame"><b>Controller</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage130693" target = "projectFrame"><b>controller</b></a></td><td>src</td><td>sourcecode package<br /><br />The Processing and Render Controller,<br />located within the MObject Subsystem</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refpackage128138" target = "projectFrame"><b>design</b></a></td><td></td><td></td></tr>
diff --git a/doc/devel/uml/public_operations.html b/doc/devel/uml/public_operations.html
index d0aedd4c7..697d67b52 100644
--- a/doc/devel/uml/public_operations.html
+++ b/doc/devel/uml/public_operations.html
@@ -29,6 +29,7 @@
 <tr bgcolor=#f0f0f0><td><a href="class139653.html#refoperation133509"><b>currEDL</b></a></td><td><a href="class139653.html#refclass139653"><b>Session</b></a></td><td>The EDL currently in focus. In most cases, Session and EDL are almost the same, just EDL emphasizes the collection aspect. But generally (for larger editing projects) one Session can contain several EDLs, which may even be nested. At any given time, only one of these EDLs has focus and recieves the editing commands.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class140165.html#refoperation134917"><b>dispatchOp</b></a></td><td><a href="class140165.html#refclass140165"><b>Visitable</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136453.html#refoperation132997"><b>enable</b></a></td><td><a href="class136453.html#refclass136453"><b>Asset</b></a></td><td>change the enabled status of this asset. Note the corresponding #isActive predicate may depend on the enablement status of parent assets as well</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140805.html#refoperation135045"><b>find</b></a></td><td><a href="class140805.html#refclass140805"><b>TypeHandler</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135429.html#refoperation131589"><b>get</b></a></td><td><a href="class135429.html#refclass135429"><b>Appconfig</b></a></td><td>access the configuation value for a given key.<br />@return empty string for unknown keys, else the corresponding configuration value</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129541.html#refoperation131205"><b>get_repr</b></a></td><td><a href="class129541.html#refclass129541"><b>Allocation</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136581.html#refoperation132485"><b>getAsset</b></a></td><td><a href="class136581.html#refclass136581"><b>AssetManager</b></a></td><td>find and return corresponging object</td></tr>
@@ -48,20 +49,23 @@
 <tr bgcolor=#f0f0f0><td><a href="class136453.html#refoperation132869"><b>isActive</b></a></td><td><a href="class136453.html#refclass136453"><b>Asset</b></a></td><td>weather this asset is swithced on and consequently included in the fixture and participates in rendering</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136581.html#refoperation132613"><b>known</b></a></td><td><a href="class136581.html#refclass136581"><b>AssetManager</b></a></td><td>@return true if the given id is registered in the internal asset DB</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139781.html#refoperation134021"><b>load</b></a></td><td><a href="class139781.html#refclass139781"><b>SessManager</b></a></td><td>replace the current session by a new<br />session loaded from serialized state.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140805.html#refoperation135173"><b>make</b></a></td><td><a href="class140805.html#refclass140805"><b>TypeHandler</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class131333.html#refoperation129413"><b>play</b></a></td><td><a href="class131333.html#refclass131333"><b>RenderEngine</b></a></td><td>TODO: will probably be handled differently (see Cehteh)</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class136581.html#refoperation132741"><b>remove</b></a></td><td><a href="class136581.html#refclass136581"><b>AssetManager</b></a></td><td>remove the given asset &lt;i&gt;together with all its dependants&lt;/i&gt; from the internal DB</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139781.html#refoperation133893"><b>reset</b></a></td><td><a href="class139781.html#refclass139781"><b>SessManager</b></a></td><td>reset all session config and <br />start with a pristine default session.</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class128645.html#refoperation128005"><b>resolve</b></a></td><td><a href="class128645.html#refclass128645"><b>Placement</b></a></td><td>create an actual (explicit) placement while trying to satisfy the network of adjacent objects and placements.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class140677.html#refoperation135301"><b>resolve</b></a></td><td><a href="class140677.html#refclass140677"><b>QueryHandler</b></a></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class141189.html#refoperation135429"><b>resolve</b></a></td><td><a href="class141189.html#refclass141189"><b>QueryHandlerImpl</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class135557.html#refoperation131973"><b>rootCause</b></a></td><td><a href="class135557.html#refclass135557"><b>Error</b></a></td><td>If this exception was caused by a chain of further exceptions,<br />return the first one registered in this throw sequence.<br />This works only, if every exceptions thrown as a consequence<br />of another exception is propperly constructed by passing<br />the original exception to the constructor</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class139781.html#refoperation134149"><b>save</b></a></td><td><a href="class139781.html#refclass139781"><b>SessManager</b></a></td><td>create a complete, serialized representation<br />of the current session config and contents.<br />@todo how to serialize, prameters, return value?</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class140293.html#refoperation134405"><b>treat</b></a></td><td><a href="class140293.html#refclass140293"><b>Applicable</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134149.html#refoperation129797"><b>treat</b></a></td><td><a href="class134149.html#refclass134149"><b>BuilderTool</b></a></td><td>This operation is to be overloaded for the specific MObject subclasses to be treated.</td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class134405.html#refoperation130565"><b>treat</b></a></td><td><a href="class134405.html#refclass134405"><b>NodeCreatorTool</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134405.html#refoperation130437"><b>treat</b></a></td><td><a href="class134405.html#refclass134405"><b>NodeCreatorTool</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134405.html#refoperation130309"><b>treat</b></a></td><td><a href="class134405.html#refclass134405"><b>NodeCreatorTool</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134405.html#refoperation130693"><b>treat</b></a></td><td><a href="class134405.html#refclass134405"><b>NodeCreatorTool</b></a></td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class134405.html#refoperation130565"><b>treat</b></a></td><td><a href="class134405.html#refclass134405"><b>NodeCreatorTool</b></a></td><td></td></tr>
-<tr bgcolor=#f0f0f0><td><a href="class134277.html#refoperation130181"><b>treat</b></a></td><td><a href="class134277.html#refclass134277"><b>SegmentationTool</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134277.html#refoperation130053"><b>treat</b></a></td><td><a href="class134277.html#refclass134277"><b>SegmentationTool</b></a></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="class134277.html#refoperation130181"><b>treat</b></a></td><td><a href="class134277.html#refclass134277"><b>SegmentationTool</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class134277.html#refoperation129925"><b>treat</b></a></td><td><a href="class134277.html#refclass134277"><b>SegmentationTool</b></a></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129333.html#refoperation128010"><b>useFile</b></a></td><td><a href="class129333.html#refclass129333"><b>FileProvider</b></a></td><td>Announces that the application intends to use this file with mode (READ|WRITE|READWRITE)</td></tr>
 <tr bgcolor=#f0f0f0><td><a href="class129333.html#refoperation128138"><b>useTemporaryStorage</b></a></td><td><a href="class129333.html#refclass129333"><b>FileProvider</b></a></td><td>Provides a pool for interminate frames</td></tr>
diff --git a/doc/devel/uml/usecasediagrams.html b/doc/devel/uml/usecasediagrams.html
index 62cd42a0e..c6ce03c64 100644
--- a/doc/devel/uml/usecasediagrams.html
+++ b/doc/devel/uml/usecasediagrams.html
@@ -17,6 +17,7 @@
 
 <table>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case diagram130821" target = "projectFrame"><b>backend use cases</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case diagram131717" target = "projectFrame"><b>when to query</b></a></td><td></td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/doc/devel/uml/usecases.html b/doc/devel/uml/usecases.html
index d55241488..9b7d44a88 100644
--- a/doc/devel/uml/usecases.html
+++ b/doc/devel/uml/usecases.html
@@ -18,8 +18,14 @@
 <table>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128389" target = "projectFrame"><b>access Channel</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128133" target = "projectFrame"><b>access File</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128901" target = "projectFrame"><b>add new object to session</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case129029" target = "projectFrame"><b>ConfigQuery</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128517" target = "projectFrame"><b>create specific object</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128261" target = "projectFrame"><b>detect Channels</b></a></td><td></td><td></td></tr>
 <tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128005" target = "projectFrame"><b>load Media</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128773" target = "projectFrame"><b>load object from session</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case129157" target = "projectFrame"><b>need sub object</b></a></td><td></td><td></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refuse case128645" target = "projectFrame"><b>use "default" object</b></a></td><td></td><td></td></tr>
 </table>
 </body>
 </html>
diff --git a/uml/lumiera/128261 b/uml/lumiera/128261
index c30e7ce9e..6394cfca5 100644
--- a/uml/lumiera/128261
+++ b/uml/lumiera/128261
@@ -1,6 +1,6 @@
 format 40
 "MObject" // ProcessingLayer::MObject
-  revision 29
+  revision 30
   modified_by 5 "hiv"
   // class settings
   //class diagram settings
@@ -104,6 +104,15 @@ configuration of all Objects to be rendered"
 	    classrelation_ref 144773 // current (<unidirectional association>)
 	  b multiplicity "" parent class_ref 139781 // SessManager
       end
+
+      classrelation 150917 // defaults (<unidirectional association>)
+	relation 148101 --->
+	  a role_name "defaults" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 150917 // defaults (<unidirectional association>)
+	  b multiplicity "" parent class_ref 141445 // DefaultsManager
+      end
     end
 
     class 128005 "SessionImpl"
diff --git a/uml/lumiera/128517 b/uml/lumiera/128517
index 14fa5def7..5eed4e170 100644
--- a/uml/lumiera/128517
+++ b/uml/lumiera/128517
@@ -1,6 +1,6 @@
 format 40
 "CommonLib" // CommonLib
-  revision 11
+  revision 12
   modified_by 5 "hiv"
   // class settings
   //class diagram settings
@@ -26,6 +26,8 @@ format 40
   package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
   show_infonote default drawing_language default
   
+  package_ref 131077 // ConfigQuery
+
   classview 128773 "error"
     //class diagram settings
     draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
diff --git a/uml/lumiera/129285 b/uml/lumiera/129285
index 17a54b8b9..1a005d8e9 100644
--- a/uml/lumiera/129285
+++ b/uml/lumiera/129285
@@ -1,6 +1,6 @@
 format 40
 "ProcessingLayer" // ProcessingLayer
-  revision 12
+  revision 13
   modified_by 5 "hiv"
   // class settings
   //class diagram settings
diff --git a/uml/lumiera/131077 b/uml/lumiera/131077
new file mode 100644
index 000000000..c996ebb90
--- /dev/null
+++ b/uml/lumiera/131077
@@ -0,0 +1,551 @@
+format 40
+"ConfigQuery" // CommonLib::ConfigQuery
+  revision 1
+  modified_by 5 "hiv"
+  // class settings
+  //class diagram settings
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  //use case diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+  //sequence diagram settings
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+  //collaboration diagram settings
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+  //object diagram settings
+   write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+  //component diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  //deployment diagram settings
+  package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  //state diagram settings
+  package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+  show_activities default region_horizontally default drawing_language default
+  //activity diagram settings
+  package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+  show_infonote default drawing_language default
+  
+  componentview 128261 "Query System overview"
+    //component diagram settings
+    package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    draw_component_as_icon default show_component_req_prov default show_component_rea default
+    componentdiagram 131589 "components"
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      draw_component_as_icon default show_component_req_prov default show_component_rea default
+      size A4
+    end
+
+    component 130565 "ConfigRules"
+      comment "A system for accessing various kinds of preconfigured objects by querying for capabilities."
+    end
+
+    component 130693 "Resolver"
+    end
+
+    component 130821 "Rule Base"
+    end
+
+    component 130949 "DefaultsManager"
+    end
+  end
+
+  classview 129157 "query"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default
+    
+    classdiagram 131461 "Rules access"
+      draw_all_relations no hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+      size A4
+    end
+
+    class 140549 "ConfigRules"
+      abstract visibility public stereotype "interface"
+      nactuals 1
+      actual class class_ref 140677 // QueryHandler
+        rank 0 explicit_value ""
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      comment "public acces point for running Config Queries"
+      classrelation 148357 // <generalisation>
+	relation 146181 ---|>
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 148357 // <generalisation>
+	  b multiplicity "" parent class_ref 140677 // QueryHandler
+      end
+
+      classrelation 148485 // <association>
+	relation 146309 ----
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 148485 // <association>
+	  b role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 148613 // <association>
+      end
+
+      classrelation 148741 // <association>
+	relation 146437 ----
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 148741 // <association>
+	  b role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 148869 // <association>
+      end
+    end
+
+    class 140677 "QueryHandler"
+      abstract visibility public stereotype "interface"
+      nformals 1
+      formal name "TY" type "class" explicit_default_value ""
+        explicit_extends ""
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      classrelation 148613 // <association>
+	relation_ref 146309 // <association>
+      end
+
+      classrelation 148869 // <association>
+	relation_ref 146437 // <association>
+      end
+
+      operation 135301 "resolve"
+	public explicit_return_type "bool"
+	nparams 2
+	  param inout name "solution" explicit_type "P<TY>"
+	  param in name "query" explicit_type "Query<TY>"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
+	cpp_def "${comment}${inline}${type}
+${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
+{
+  ${body}
+}
+
+"
+	
+	
+      end
+    end
+
+    class 140805 "TypeHandler"
+      abstract visibility public stereotype "interface"
+      nformals 1
+      formal name "TY" type "class" explicit_default_value ""
+        explicit_extends ""
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+      operation 135045 "find"
+	abstract cpp_virtual public explicit_return_type "TY"
+	nparams 1
+	  param in name "capabilities" explicit_type "Pred"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
+	
+	
+      end
+
+      operation 135173 "make"
+	abstract cpp_virtual public explicit_return_type "TY"
+	nparams 1
+	  param in name "capabilities" explicit_type "Pred"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
+	
+	
+      end
+    end
+
+    class 140933 "ResolverBase"
+      abstract visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 148997 // <realization>
+	relation 146565 -_-|>
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 148997 // <realization>
+	  b multiplicity "" parent class_ref 140549 // ConfigRules
+      end
+    end
+
+    class 141061 "YAP_Prolog"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 150405 // <dependency>
+	relation 147717 -_->
+	  a default
+	    cpp default "Generated"
+	    classrelation_ref 150405 // <dependency>
+	  b multiplicity "" parent class_ref 140805 // TypeHandler
+      end
+    end
+
+    class 141189 "QueryHandlerImpl"
+      visibility package 
+      nformals 1
+      formal name "TY" type "class" explicit_default_value ""
+        explicit_extends ""
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 149125 // <generalisation>
+	relation 146693 ---|>
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 149125 // <generalisation>
+	  b multiplicity "" parent class_ref 140933 // ResolverBase
+      end
+
+      classrelation 149253 // <association>
+	relation 146821 ----
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 149253 // <association>
+	  b role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 149381 // <association>
+      end
+
+      classrelation 149381 // <association>
+	relation_ref 146821 // <association>
+      end
+
+      classrelation 149509 // <association>
+	relation 146949 ----
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 149509 // <association>
+	  b role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 149637 // <association>
+      end
+
+      classrelation 149637 // <association>
+	relation_ref 146949 // <association>
+      end
+
+      operation 135429 "resolve"
+	public explicit_return_type "bool"
+	nparams 2
+	  param inout name "solution" explicit_type "P<TY>"
+	  param in name "query" explicit_type "Query<TY>"
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
+	cpp_def "${comment}${inline}${type}
+${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
+{
+  ${body}
+}
+
+"
+	
+	
+      end
+
+      classrelation 149765 // <unidirectional association>
+	relation 147077 --->
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 149765 // <unidirectional association>
+	  b multiplicity "" parent class_ref 141061 // YAP_Prolog
+      end
+
+      classrelation 150149 // <unidirectional association>
+	relation 147461 --->
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 150149 // <unidirectional association>
+	  b multiplicity "" parent class_ref 141061 // YAP_Prolog
+      end
+
+      classrelation 150277 // <unidirectional association>
+	relation 147589 --->
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 150277 // <unidirectional association>
+	  b multiplicity "" parent class_ref 141061 // YAP_Prolog
+      end
+    end
+
+    class 141317 "TypeHandler<Pipe>"
+      visibility package 
+      nactuals 1
+      actual class class_ref 140805 // TypeHandler
+        rank 0 explicit_value ""
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 149893 // <unidirectional association>
+	relation 147205 --->
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 149893 // <unidirectional association>
+	  b multiplicity "" parent class_ref 138117 // Pipe
+      end
+
+      classrelation 150021 // <realization>
+	relation 147333 -_-|>
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 150021 // <realization>
+	  b multiplicity "" parent class_ref 140805 // TypeHandler
+      end
+    end
+
+    class 141445 "DefaultsManager"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 150533 // <dependency>
+	relation 147845 -_->
+	  a default
+	    cpp default "Generated"
+	    classrelation_ref 150533 // <dependency>
+	  b multiplicity "" parent class_ref 140549 // ConfigRules
+      end
+
+      classrelation 150661 // <association>
+	relation 147973 ----
+	  a role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 150661 // <association>
+	  b role_name "" multiplicity "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 150789 // <association>
+      end
+    end
+
+    class 141573 "DefaultsRegistry"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 150789 // <association>
+	relation_ref 147973 // <association>
+      end
+    end
+  end
+
+  usecaseview 128389 "query use"
+    //use case diagram settings
+    package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    usecasediagram 131717 "when to query"
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      size A4
+    end
+
+    usecase 128517 "create specific object"
+      //use case diagram settings
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      //sequence diagram settings
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+      //collaboration diagram settings
+      show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+      //object diagram settings
+       write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    end
+
+    usecase 128645 "use \"default\" object"
+      //use case diagram settings
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      //sequence diagram settings
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+      //collaboration diagram settings
+      show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+      //object diagram settings
+       write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      simplerelation 129541
+	---|>
+	  on usecase_ref 128517 // create specific object
+      end
+    end
+
+    usecase 128773 "load object from session"
+      //use case diagram settings
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      //sequence diagram settings
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+      //collaboration diagram settings
+      show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+      //object diagram settings
+       write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    end
+
+    usecase 128901 "add new object to session"
+      //use case diagram settings
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      //sequence diagram settings
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+      //collaboration diagram settings
+      show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+      //object diagram settings
+       write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    end
+
+    class 141701 "User"
+      visibility package stereotype "actor"
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+    end
+
+    class 141829 "Serializer"
+      visibility package stereotype "actor"
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+    end
+
+    usecase 129029 "ConfigQuery"
+      //use case diagram settings
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      //sequence diagram settings
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+      //collaboration diagram settings
+      show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+      //object diagram settings
+       write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    end
+
+    usecase 129157 "need sub object"
+      //use case diagram settings
+      package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+      //sequence diagram settings
+      show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default
+      //collaboration diagram settings
+      show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+      //object diagram settings
+       write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+    end
+
+    collaborationdiagram 131845 "\"default\" object"
+      show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+      size A4
+    end
+
+    classinstance 135941 "predicate impl"
+      type class_ref 140805 // TypeHandler
+      attributes
+        end
+      relations
+        end
+    end
+  end
+end
diff --git a/uml/lumiera/131461.diagram b/uml/lumiera/131461.diagram
new file mode 100644
index 000000000..2afd439c2
--- /dev/null
+++ b/uml/lumiera/131461.diagram
@@ -0,0 +1,196 @@
+format 40
+
+packagecanvas 128005 
+  package_ref 131077 // ConfigQuery
+    xyzwh 194 34 1980 445 495
+classcanvas 128133 class_ref 140549 // ConfigRules
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  color verylightorange
+  xyz 268 364 2005
+  end
+classcanvas 128261 class_ref 140677 // QueryHandler
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 217 237 2005
+  end
+classcanvas 128389 class_ref 140677 // QueryHandler
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 264 218 2005
+  end
+classcanvas 128517 class_ref 140677 // QueryHandler
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 302 205 2005
+  end
+classcanvas 128645 class_ref 140805 // TypeHandler
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 262 88 2005
+  end
+classcanvas 128901 class_ref 140805 // TypeHandler
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 215 98 2010
+  end
+classcanvas 129029 class_ref 140805 // TypeHandler
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 307 77 1995
+  end
+classcanvas 129541 class_ref 140933 // ResolverBase
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 451 223 2000
+  end
+classcanvas 129669 class_ref 141061 // YAP_Prolog
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 554 155 2000
+  end
+classcanvas 130437 class_ref 141189 // QueryHandlerImpl
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 439 280 2000
+  end
+classcanvas 130693 class_ref 141189 // QueryHandlerImpl
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 439 360 2000
+  end
+classcanvas 130821 class_ref 141189 // QueryHandlerImpl
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 439 442 2000
+  end
+classcanvas 132613 class_ref 138117 // Pipe
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 84 123 2000
+  end
+classcanvas 132741 class_ref 141317 // TypeHandler<Pipe>
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 18 244 2000
+  end
+classcanvas 133381 class_ref 136581 // AssetManager
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 19 25 2005
+  end
+fragment 133637 "Rule Base"
+  xyzwh 425 67 1985 202 78
+end
+classcanvas 135941 class_ref 141445 // DefaultsManager
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 58 415 2000
+  end
+classcanvas 136069 class_ref 141573 // DefaultsRegistry
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 59 481 2000
+  end
+classcanvas 136709 class_ref 139653 // Session
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 19 313 2005
+  end
+textcanvas 137093 "queries"
+  xyzwh 201 414 2000 38 18
+textcanvas 137221 "invokes"
+  xyzwh 557 500 2005 40 18
+textcanvas 137349 "invokes"
+  xyzwh 549 386 2005 40 18
+textcanvas 137477 "provide type specific implementation"
+  xyzwh 83 207 2005 102 39
+note 137605 "Prolog rules use TypeHandler interface to imlement predicates"
+  xyzwh 503 38 2000 176 59
+classcanvas 137733 class_ref 137989 // Track
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 104 99 1995
+  end
+classcanvas 137861 class_ref 138757 // ProcPatt
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 118 75 1990
+  end
+classcanvas 137989 class_ref 129029 // Effect
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 134 47 1985
+  end
+classcanvas 138117 class_ref 137861 // Codec
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default
+  xyz 144 22 1975
+  end
+relationcanvas 128773 relation_ref 146181 // <generalisation>
+  from ref 128133 z 2004 to ref 128261
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 129157 relation_ref 146309 // <association>
+  from ref 128133 z 2004 to ref 128389
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 129285 relation_ref 146437 // <association>
+  from ref 128133 z 1999 to ref 128517
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 130565 relation_ref 146693 // <generalisation>
+  from ref 130437 z 1999 to ref 129541
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 130949 relation_ref 146821 // <association>
+  from ref 130821 z 1999 to ref 130693
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 131077 relation_ref 146949 // <association>
+  from ref 130693 z 1999 to ref 130437
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 131973 relation_ref 146693 // <generalisation>
+  from ref 130693 z 1999 to ref 129541
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 132101 relation_ref 146693 // <generalisation>
+  from ref 130821 z 1999 to ref 129541
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 132869 relation_ref 147205 // <unidirectional association>
+  from ref 132741 z 1999 to point 73 205
+  line 133509 z 1999 to ref 132613
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 132997 relation_ref 147333 // <realization>
+  from ref 132741 z 1999 to point 73 226
+  line 133253 z 1999 to point 168 226
+  line 133125 z 1999 to ref 128901
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 133765 relation_ref 147077 // <unidirectional association>
+  from ref 130693 z 1999 to point 542 417
+  line 133893 z 1999 to point 589 403
+  line 134021 z 1999 to ref 129669
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 134149 relation_ref 146565 // <realization>
+  from ref 129541 z 1999 to point 491 182
+  line 134661 z 1999 to point 434 182
+  line 134533 z 1999 to point 348 473
+  line 134405 z 1999 to point 304 473
+  line 134277 z 1999 to ref 128133
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 134789 relation_ref 147461 // <unidirectional association>
+  from ref 130821 z 1999 to point 543 502
+  line 135045 z 1999 to point 589 490
+  line 134917 z 1999 to ref 129669
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 135173 relation_ref 147589 // <unidirectional association>
+  from ref 130437 z 1999 to point 543 337
+  line 135429 z 1999 to point 589 320
+  line 135301 z 1999 to ref 129669
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 135557 relation_ref 147717 // <dependency>
+  from ref 129669 z 1994 to point 588 116
+  line 135685 z 1994 to point 440 116
+  line 135813 z 1994 to ref 129029
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 136197 relation_ref 147845 // <dependency>
+  from ref 135941 z 1999 to ref 128133
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 136581 relation_ref 147973 // <association>
+  from ref 135941 z 1999 to ref 136069
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+relationcanvas 136837 relation_ref 148101 // <unidirectional association>
+  from ref 136709 z 1999 to point 105 348
+  line 136965 z 1999 to ref 135941
+  role_a_pos 117 390 3000 no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
diff --git a/uml/lumiera/131589.diagram b/uml/lumiera/131589.diagram
new file mode 100644
index 000000000..81414854d
--- /dev/null
+++ b/uml/lumiera/131589.diagram
@@ -0,0 +1,21 @@
+format 40
+
+componentcanvas 128005 component_ref 130565 // ConfigRules
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  xyzwh 207 133 2000 259 219
+componentcanvas 128133 component_ref 130693 // Resolver
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  xyzwh 416 17 2005 155 63
+componentcanvas 128261 component_ref 130821 // Rule Base
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  xyzwh 227 15 2000 156 82
+componentcanvas 128389 component_ref 128645 // AssetManagement
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  xyzwh 461 366 2000 187 120
+componentcanvas 128517 component_ref 128133 // Session
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  xyzwh 23 15 2000 190 108
+componentcanvas 128645 component_ref 130949 // DefaultsManager
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  xyzwh 23 146 2005 155 63
+end
diff --git a/uml/lumiera/131717.diagram b/uml/lumiera/131717.diagram
new file mode 100644
index 000000000..b633daae5
--- /dev/null
+++ b/uml/lumiera/131717.diagram
@@ -0,0 +1,45 @@
+format 40
+
+usecasecanvas 128005 usecase_ref 128517 // create specific object
+  xyzwh 461 161 3005 64 32 label_xy 442 193
+usecasecanvas 128133 usecase_ref 128645 // use "default" object
+  xyzwh 462 267 3005 64 32 label_xy 448 299
+usecasecanvas 128261 usecase_ref 128773 // load object from session
+  xyzwh 159 259 3005 64 32 label_xy 132 291
+usecasecanvas 128389 usecase_ref 128901 // add new object to session
+  xyzwh 159 116 3005 64 32 label_xy 128 148
+classcanvas 128517 class_ref 141701 // User
+  xyz 40 56 3005 label_xy 48 96
+classcanvas 128645 class_ref 141829 // Serializer
+  xyz 40 255 3005 label_xy 38 295
+usecasecanvas 128773 usecase_ref 129029 // ConfigQuery
+  color lightorange
+  xyzwh 337 211 3005 64 32 label_xy 338 243
+usecasecanvas 129797 usecase_ref 129157 // need sub object
+  xyzwh 358 61 3005 64 32 label_xy 352 93
+packagecanvas 130437 
+  package_ref 131077 // ConfigQuery
+    xyzwh 304 18 3010 281 390
+fragment 130693 "EDL/Session"
+  xyzwh 94 40 3009 181 368
+end
+line 128901 --->
+  from ref 128517 z 3004 to ref 128389
+line 129029 --->
+  from ref 128389 z 3004 to ref 128773
+simplerelationcanvas 129157 simplerelation_ref 129541
+  from ref 128133 z 3004 to ref 128005
+line 129285 --->
+  from ref 128773 z 3004 to ref 128005
+line 129413 --->
+  from ref 128773 z 3004 to ref 128133
+line 129541 --->
+  from ref 128261 z 3004 to ref 128773
+line 129669 --->
+  from ref 128645 z 3004 to ref 128261
+line 129925 --->
+  from ref 128005 z 1999 to point 489 87
+  line 130053 z 1999 to ref 129797
+line 130309 --->
+  from ref 129797 z 3004 to ref 128773
+end
diff --git a/uml/lumiera/131845.diagram b/uml/lumiera/131845.diagram
new file mode 100644
index 000000000..aa4bf61a3
--- /dev/null
+++ b/uml/lumiera/131845.diagram
@@ -0,0 +1,68 @@
+format 40
+
+classinstance 128005 class_ref 140549 // ConfigRules
+ name ""  xyz 245 192 2000
+classinstance 128133 class_ref 141445 // DefaultsManager
+ name ""  xyz 51 83 2000
+classinstance 128261 class_ref 141573 // DefaultsRegistry
+ name ""  xyz 244 58 2000
+classinstancecanvas 128517 classinstance_ref 135941 // predicate impl
+  xyz 344 347 2000
+  end
+classinstance 128901 class_ref 135301 // Factory
+ name ""  xyz 439 206 2000
+classinstance 129797 class_ref 136581 // AssetManager
+ name ""  xyz 376 447 2000
+textcanvas 130437 "recursive invocation of sub queries"
+  xyzwh 332 185 2004 172 18
+linkcanvas 128389
+  from ref 128133 z 1999 to ref 128261
+dirscanvas 129413 z 1000 linkcanvas_ref 128389
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+  forward_label "1 get registered default object
+6 store new default object" xyz 92 30 3000
+linkcanvas 128645
+  from ref 128133 z 1999 to ref 128005
+dirscanvas 129541 z 1000 linkcanvas_ref 128645
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+  forward_label "2 resolve(inout solution : Query<TY>) : bool" xyz 94 157 3000
+linkcanvas 128773
+  from ref 128005 z 1999 to ref 128517
+dirscanvas 129669 z 1000 linkcanvas_ref 128773
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+  forward_label "3 run prolog code" xyz 335 248 3000
+linkcanvas 129029
+  from ref 128517 z 1999 to ref 128901
+dirscanvas 130181 z 1000 linkcanvas_ref 129029
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+  forward_label "5 create new instances" xyz 448 275 3000
+linkcanvas 129925
+  from ref 128517 z 1999 to ref 129797
+dirscanvas 130053 z 1000 linkcanvas_ref 129925
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default
+  forward_label "4 retrieve existing object" xyz 436 403 3000
+linkcanvas 130309
+  from ref 128901 z 1999 to ref 128005
+msgs
+  explicitmsg "get registered default object"
+    forward ranks 1 "1" dirscanvas_ref 129413
+    no_msg
+  explicitmsg "resolve(inout solution : Query<TY>) : bool"
+    forward ranks 2 "2" dirscanvas_ref 129541
+    msgs
+      explicitmsg "run prolog code"
+	forward ranks 3 "2.1" dirscanvas_ref 129669
+	msgs
+	  explicitmsg "retrieve existing object"
+	    forward ranks 4 "2.1.1" dirscanvas_ref 130053
+	    no_msg
+	  explicitmsg "create new instances"
+	    forward ranks 5 "2.1.2" dirscanvas_ref 130181
+	    no_msg
+	msgsend
+    msgsend
+  explicitmsg "store new default object"
+    forward ranks 6 "3" dirscanvas_ref 129413
+    no_msg
+msgsend
+end
diff --git a/uml/lumiera/5.session b/uml/lumiera/5.session
index 2d78dfa96..89c760008 100644
--- a/uml/lumiera/5.session
+++ b/uml/lumiera/5.session
@@ -3,34 +3,34 @@ diagrams
   classdiagram_ref 130309 // Asset Kinds
     860 633 100 4 158 0
   classdiagram_ref 128133 // Session structure
-    860 633 100 4 289 0
+    860 633 100 4 349 0
   classdiagram_ref 128389 // Render Entities
     743 538 100 4 184 0
-  active  classdiagram_ref 131205 // Struct-Asset Relations
-    555 620 100 4 0 0
+  classdiagram_ref 131205 // Struct-Asset Relations
+    555 620 100 4 60 0
+  classdiagram_ref 131461 // Rules access
+    688 627 100 4 0 0
+  componentdiagram_ref 131589 // components
+    688 544 100 4 0 0
+  active  usecasediagram_ref 131717 // when to query
+    624 495 100 4 0 0
+  collaborationdiagram_ref 131845 // "default" object
+    626 551 100 4 0 0
 end
 show_stereotypes
 selected 
-package_ref 129 // lumiera
+  package_ref 129 // lumiera
 open
-  componentview_ref 128133 // interfaces
-  deploymentview_ref 128133 // EXE Deployment
-  deploymentview_ref 128645 // gen
-  class_ref 137477 // Unknown
-  class_ref 137605 // Preview
-  class_ref 137989 // Track
-  class_ref 128005 // SessionImpl
-  class_ref 128133 // EDL
-  class_ref 128261 // Fixture
-  class_ref 128389 // Track
-  class_ref 128645 // Placement
-  class_ref 129413 // RelativeLocation
-  class_ref 129541 // Allocation
-  class_ref 140421 // Plug
-  class_ref 139909 // LocatingPin
-  class_ref 134021 // Buildable
-  class_ref 134149 // BuilderTool
-  class_ref 134405 // NodeCreatorTool
+  
+  package_ref 128005 // design
+  
+  package_ref 129285 // ProcessingLayer
+  componentview_ref 128261 // Query System overview
+  class_ref 140677 // QueryHandler
+  class_ref 140805 // TypeHandler
+  class_ref 140933 // ResolverBase
+  class_ref 141189 // QueryHandlerImpl
+  usecaseview_ref 128389 // query use
   classview_ref 128773 // error
   class_ref 140165 // Visitable
 end
diff --git a/uml/lumiera/lumiera.prj b/uml/lumiera/lumiera.prj
index 555a8d3ba..8eec4bb57 100644
--- a/uml/lumiera/lumiera.prj
+++ b/uml/lumiera/lumiera.prj
@@ -1,6 +1,6 @@
 format 40
 "lumiera"
-  revision 42
+  revision 43
   modified_by 5 "hiv"
   cpp_root_dir "../../src/"
 
@@ -57,7 +57,7 @@ format 40
     2008,               Christian Thaeter <ct@pipapo.org>
 
 "
-  key "html dir" value "/mnt/Lager/heim/devel/cin3/doc/devel/uml/"
+  key "html dir" value "/mnt/Lager/heim/devel/lumi/doc/devel/uml/"
   key "" value ""
   package_ref 128005 // design
 
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 6d764e90b..c70827a4f 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -797,6 +797,33 @@ Error: #f88</pre>
 &amp;rarr; [[Configuration Rules system|ConfigRules]]
 </pre>
 </div>
+<div title="ConfigQueryIntegration" modifier="Ichthyostega" modified="200804070308" created="200804070247" tags="overview draft impl" changecount="8">
+<pre>* planning to embed a YAP Prolog engine
+* currently just integrated by a table driven mock
+* the baseline is a bit more clear by now (4/08)
+
+&amp;rarr; see also ConfigRules
+&amp;rarr; see also DefaultsManagement
+
+!Use cases
+[&lt;img[when to run config queries|uml/fig131717.png]]
+
+The key idea is that there is a Rule Base &amp;mdash; partly contained in the session (building on a stock of standard rules supplied with the application). Now, whenever there is the need to get a new object, for adding it to the session or for using associated with another object &amp;mdash; then instead of creating it by a direct hard wired ctor call, we issue a ConfigQuery requesting an object of the given type with some //capabilities// defined by predicates. The same holds true when loading an existing session: some objects won't be loaded back blindly, rather they will be re-created by issuing the config queries again. Especially important is the case of (re)creating a [[processing pattern|ProcPatt]] guiding how to wire up the processing pipeline for some given media.
+
+At various places, instead of requiring a fixed set of capabilities, it is possible to request a &quot;default configured&quot; object instead, specifying just those capabilities we really need to be configured in a specific way. This is done by using the [Defaults Manager|DefaultsManagement] accessible on the [[Session]] interface. Such a default object query may either retrieve an already existing object instance, run further config queries, and finally result in the invocation of a factory for creating new objects &amp;mdash; just as necessary and guarded by the rules.
+
+@@clear(left):display(block):@@
+
+!Components and Relations
+[&gt;img[participating classes|uml/fig131461.png]]
+
+@@clear(right):display(block):@@
+
+!when querying for a [[&quot;default&quot;|DefaultsManagement]] object
+[&lt;img[colaboration when issuing a defaults query|uml/fig131845.png]]
+
+@@clear(left):display(block):@@</pre>
+</div>
 <div title="ConfigRules" modifier="Ichthyostega" modified="200802200145" created="200801171352" tags="overview spec" changecount="11">
 <pre>Many features can be implemented by specifically configuring and wiring some unspecific components. Rather than tie the client code in need of some given feature to these configuration internals, in Lumiera the client can //query // for some kind of object providing the //needed capabilities. // Right from start (summer 2007), Ichthyo had the intention to implement such a feature using sort of a ''declarative database'', e.g. by embedding a Prolog system. By adding rules to the basic session configuration, users should be able to customize the semi-automatic part of Lumiera's behaviour to great extent.
 
@@ -1140,7 +1167,7 @@ For this Lumiera design, we could consider making GOP just another raw media dat
 &amp;rarr;see in [[Wikipedia|http://en.wikipedia.org/wiki/Group_of_pictures]]
 </pre>
 </div>
-<div title="ImplementationDetails" modifier="Ichthyostega" modified="200802031829" created="200708080322" tags="overview" changecount="21">
+<div title="ImplementationDetails" modifier="Ichthyostega" modified="200804070244" created="200708080322" tags="overview" changecount="22">
 <pre>This wiki page is the entry point to detail notes covering some technical decisions, details and problems encountered in the course of the implementation of the Lumiera Renderengine, the Builder and the related parts.
 
 * [[Packages, Interfaces and Namespaces|InterfaceNamespaces]]
@@ -1154,6 +1181,7 @@ For this Lumiera design, we could consider making GOP just another raw media dat
 * [[using the Visitor pattern?|VisitorUse]] &amp;mdash; resulting in [[»Visiting-Tool« library implementation|VisitingToolImpl]]
 * [[Handling of Tracks and render Pipes in the EDL|TrackPipeEDL]]. [[Handling of Tracks|TrackHandling]] and [[Pipes|PipeHandling]]
 * [[getting default configured|DefaultsManagement]] Objects relying on [[rule-based Configuration Queries|ConfigRules]]
+* [[integrating the Config Query system|ConfigQueryIntegration]]
 * [[identifying the basic Builder operations|BasicBuildingOperations]] and [[planning the Implementation|PlanningNodeCreatorTool]]
 * [[how to handle »attached placement«|AttachedPlacementProblem]]
 </pre>
@@ -2465,12 +2493,13 @@ Besides, they provide an important __inward interface__ for the [[ProcNode]]s, w
 
 </pre>
 </div>
-<div title="ProcLayer and Engine" modifier="Ichthyostega" modified="200802031830" created="200706190056" tags="overview" changecount="4">
+<div title="ProcLayer and Engine" modifier="Ichthyostega" modified="200804070258" created="200706190056" tags="overview" changecount="7">
 <pre>The Render Engine is the part of the application doing the actual video calculations. Its operations are guided by the Objects and Parameters edited by the user in [[the EDL|EDL]] and it retrieves the raw audio and video data from the [[Data backend|backend.html]]. Because the inner workings of the Render Engine are closely related to the structures used in the EDL, this design covers [[the aspect of objects placed into the EDL|MObjects]] as well.
 &lt;&lt;&lt;
 ''Status'': started out as design draft in summer '07, Ichthyo is now in the middle of a implementing the foundations and main structures in C++
 * basic AssetManager working
 * currently impmenenting the Builder (&amp;rarr;[[more|PlanningNodeCreatorTool]])
+* intermittently working out how to deal with &amp;rarr; [[ConfigQueries / default objects|ConfigQueryIntegration]])
 &lt;&lt;&lt;
 
 !Summary
@@ -2486,7 +2515,7 @@ The system is ''open'' inasmuch every part mirrors the structure of correspondin
 &amp;rarr; [[Overview Render Engine|OverviewRenderEngine]]
 &amp;rarr; BuildProcess and RenderProcess
 &amp;rarr; [[Two Examples|Examples]] (Object diagrams) 
-&amp;rarr; how [[Automation]] works  {{red{to be defined in more detail}}}
+&amp;rarr; how [[Automation]] works
 &amp;rarr; [[Problems|ProblemsTodo]] to be solved and notable [[design decisions|DesignDecisions]]
 &amp;rarr; [[Implementation Details|ImplementationDetails]] {{red{WIP}}}
 </pre>

From ed2799b76f80cf0323b945c3b50fff5ba40b9c23 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 7 Apr 2008 08:03:22 +0200
Subject: [PATCH 25/36] getting the first test of defsmanagerimpltest.cpp to
 run ..adding some backdoors and bashing at the mock implementation to fake
 the behaviour of a real resolution engine

---
 src/common/configrules.cpp                    | 17 +++++++++
 src/common/configrules.hpp                    | 14 ++++++++
 src/common/query/mockconfigrules.cpp          | 11 ++++++
 src/common/query/mockconfigrules.hpp          | 36 ++++++++++++-------
 src/proc/mobject/session/defsmanager.cpp      |  3 +-
 .../mobject/session/defsmanagerimpltest.cpp   |  3 ++
 .../mobject/session/defsregistryimpltest.cpp  |  2 +-
 7 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/src/common/configrules.cpp b/src/common/configrules.cpp
index 504df330f..3a1ae1bdd 100644
--- a/src/common/configrules.cpp
+++ b/src/common/configrules.cpp
@@ -51,4 +51,21 @@ namespace lumiera
   SingletonSub<ConfigRules> ConfigRules::instance (typeinfo); 
 
 
+  
+  
+    
+  namespace query
+    {
+    namespace // local definitions: implementing a backdoor for tests
+      {
+        string fakeBypass; 
+      } 
+    
+    void setFakeBypass(string const& q)  { fakeBypass = q; }
+    bool isFakeBypass (string const& q)  { return q == fakeBypass; }
+    
+  } // namespace query
+
+    
+  
 } // namespace lumiera
diff --git a/src/common/configrules.hpp b/src/common/configrules.hpp
index 890a36a86..81da041ae 100644
--- a/src/common/configrules.hpp
+++ b/src/common/configrules.hpp
@@ -222,5 +222,19 @@ namespace lumiera
     };
   
   
+  
+    
+  namespace query
+    {
+    
+    /** backdoor for tests: the next config query with this query string
+     *  will magically suceed with every candidate object provided. This
+     *  is currently necessary to get objects into the defaults manager,
+     *  as the query system is not able to do real query resolution */
+    void setFakeBypass(string const& q);
+    bool isFakeBypass (string const& q);
+    
+  } // namespace query
+  
 } // namespace lumiera
 #endif
diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp
index 7589d84f7..f05f3c745 100644
--- a/src/common/query/mockconfigrules.cpp
+++ b/src/common/query/mockconfigrules.cpp
@@ -133,6 +133,17 @@ namespace lumiera
       return true;
     }
     
+    /** for entering "valid" solutions on-the-fly from tests */
+    template<class TY>
+    bool 
+    MockTable::set_new_mock_solution (Query<TY>& q, typename WrapReturn<TY>::Wrapper& obj)
+    {
+      answer_->insert (entry<TY> (q, obj));
+      return true;
+    }
+    // generate the necessary specialisations-----------------------------
+    template bool MockTable::set_new_mock_solution (Query<Pipe>&, PPipe&);
+    
 
     
     
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index c3f6684ca..c4f56aeef 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -109,9 +109,12 @@ namespace lumiera
         
         // special cases....
         template<class TY> 
-        bool detect_case (Query<TY>& q);
+        bool detect_case (typename WrapReturn<TY>::Wrapper&, Query<TY>& q);
         bool fabricate_matching_new_Pipe (Query<Pipe>& q, string const& pipeID, string const& streamID);
         bool fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID);
+        
+        template<class TY>
+        bool set_new_mock_solution (Query<TY>& q, typename WrapReturn<TY>::Wrapper& candidate);
 
         
       private:
@@ -150,11 +153,14 @@ namespace lumiera
         bool
         try_special_case (Ret& solution, const Query<TY>& q)
           {
+            if (solution && isFakeBypass(q))       // backdoor for tests
+              return solution;
+            
             Query<TY> newQuery = q;
             if (is_defaults_query (newQuery))  // modified query..
               return solution = Session::current->defaults (newQuery);
                                              //   may cause recursion
-            if (detect_case (newQuery))
+            if (detect_case (solution, newQuery))
               return resolve (solution, newQuery);
             
             return solution = Ret();     // fail: return default-constructed empty smart ptr
@@ -165,35 +171,39 @@ namespace lumiera
     /** Hook for treating very special cases for individual types only */
     template<class TY>
     inline bool 
-    MockTable::detect_case (Query<TY>& q)
+    MockTable::detect_case (typename WrapReturn<TY>::Wrapper&, Query<TY>& q)
     {
       q.clear(); // end recursion
       return false;
     }
     template<>
     inline bool 
-    MockTable::detect_case (Query<Pipe>& q)
+    MockTable::detect_case (WrapReturn<Pipe>::Wrapper& candidate, Query<Pipe>& q)
     {
       const string pipeID   = extractID("pipe", q);
       const string streamID = extractID("stream", q);
+      
+      if (candidate && pipeID == candidate->getPipeID())
+        return set_new_mock_solution (q, candidate); // "learn" this solution to be "valid"
+      
       if (!isnil(pipeID) && !isnil(streamID))
-          return fabricate_matching_new_Pipe (q, pipeID, streamID);
+        return fabricate_matching_new_Pipe (q, pipeID, streamID);
       
       q.clear();
       return false;
     }
     template<>
     inline bool 
-    MockTable::detect_case (Query<const ProcPatt>& q)
+    MockTable::detect_case (WrapReturn<const ProcPatt>::Wrapper& candidate, Query<const ProcPatt>& q)
     {
-      const string streamID = extractID("stream", q);
-      if (!isnil(streamID))
-          return fabricate_ProcPatt_on_demand (q, streamID);
+      if (!isnil (extractID("make", q)))
+        return false; // let the query fail here,
+                     //  so the invoking factory will go ahead
+                    //   and create a new object.
       
-      // note: we don't handle the case of "make(PP), capabilities....." specially
-      // because either someone puts a special object into the mock table, or the
-      // recursive query done by the StructFactory simply fails, resulting in
-      // the StructFactory issuing a ProcPatt ctor call.
+      const string streamID = extractID("stream", q);
+      if (!candidate && !isnil(streamID))
+          return fabricate_ProcPatt_on_demand (q, streamID);
       
       q.clear();
       return false;
diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp
index 1d6f92e9a..c84e5116d 100644
--- a/src/proc/mobject/session/defsmanager.cpp
+++ b/src/proc/mobject/session/defsmanager.cpp
@@ -58,9 +58,8 @@ namespace mobject
       shared_ptr<TAR> res;
       QueryHandler<TAR>& typeHandler = ConfigRules::instance();  
       for (DefsRegistry::Iter<TAR> i = defsRegistry->candidates(capabilities); 
-           i.hasNext(); ++i )
+           res = *i ; ++i )
         {
-          shared_ptr<TAR> res (*i);
           typeHandler.resolve (res, capabilities);
           if (res)
             return res;
diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
index ff94f8a85..8aa773d5f 100644
--- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
@@ -105,7 +105,10 @@ namespace asset
             ASSERT (!find (pipe2->getPipeID()), "accidental clash of random test-IDs");
             
             // now declare that these objects should be considered "default"
+lumiera::query::setFakeBypass("");  /////////////////////////////////////////////////TODO mock resolution            
             ASSERT (Session::current->defaults.define (pipe1, Query<Pipe> (""))); // unrestricted default
+
+lumiera::query::setFakeBypass("stream("+sID+")"); ///////////////////////////////////TODO mock resolution            
             ASSERT (Session::current->defaults.define (pipe2, Query<Pipe> ("stream("+sID+")")));
             
             ASSERT ( find (pipe1->getPipeID()), "failure declaring object as default");
diff --git a/tests/components/proc/mobject/session/defsregistryimpltest.cpp b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
index fa5d2c4c3..b67b6cbe2 100644
--- a/tests/components/proc/mobject/session/defsregistryimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
@@ -201,7 +201,7 @@ namespace mobject
               uint d=0;
               uint d_prev=0;
               Iter23 j = reg_->candidates(Q23 ("some crap"));
-              for ( ; j.hasNext(); ++j )
+              for ( ; *j ; ++j )
                 {
                   ASSERT ( *j );
                   Q23 qx ((*j)->instanceID);

From 0b5b9b593e3cb9f04fa36df6244d2455624a3b00 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Tue, 8 Apr 2008 03:21:24 +0200
Subject: [PATCH 26/36] DefsManagerImpl_test now running

---
 src/common/query/mockconfigrules.cpp | 15 ++++++++++++---
 src/common/query/mockconfigrules.hpp | 13 ++++++++++---
 tests/53session.tests                |  5 +++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp
index f05f3c745..ddc7bd57a 100644
--- a/src/common/query/mockconfigrules.cpp
+++ b/src/common/query/mockconfigrules.cpp
@@ -97,11 +97,10 @@ namespace lumiera
       // for baiscpipetest.cpp ---------
       answer_->insert (entry_Struct<cPP> ("stream(video)"));
       answer_->insert (entry_Struct<cPP> ("stream(teststream)"));
-      item<cPP> (answer_, "stream(default)")  = item<cPP> (answer_,"stream(video)"); //TODO killme
+      item<cPP> (answer_, "stream(default)")  = item<cPP> (answer_,"stream(video)"); // set up a default stream
       
       answer_->insert (entry_Struct<Pipe> ("pipe(master), stream(video)"));
-      item<Pipe> (answer_, "pipe(default)")   = item<Pipe>(answer_,"pipe(master), stream(video)"); //TODO killme
-      TODO ("remove the default entries!!!  DefaultsManager should find them automatically");
+      item<Pipe> (answer_, "default(P)") = item<Pipe>(answer_,"pipe(master), stream(video)");
     }
     
     
@@ -121,6 +120,16 @@ namespace lumiera
       answer_->insert (entry<Pipe> (q, newPipe));
       return true; // denotes query will now succeed...
     }
+    /** special case: create a new pipe for a specific stream ID */
+    bool 
+    MockTable::fabricate_new_Pipe_for_stream (Query<Pipe>& q, string const& streamID)
+    {
+      typedef WrapReturn<Pipe>::Wrapper Ptr;
+      
+      Ptr newPipe (Struct::create (Query<Pipe> ("make(PP), "+q)));
+      answer_->insert (entry<Pipe> (q, newPipe));
+      return true;
+    }
     /** special case: create/retrieve new rocessing pattern for given stream ID... */
     bool 
     MockTable::fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID)
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index c4f56aeef..dba328754 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -111,6 +111,7 @@ namespace lumiera
         template<class TY> 
         bool detect_case (typename WrapReturn<TY>::Wrapper&, Query<TY>& q);
         bool fabricate_matching_new_Pipe (Query<Pipe>& q, string const& pipeID, string const& streamID);
+        bool fabricate_new_Pipe_for_stream (Query<Pipe>& q, string const& streamID);
         bool fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID);
         
         template<class TY>
@@ -180,6 +181,11 @@ namespace lumiera
     inline bool 
     MockTable::detect_case (WrapReturn<Pipe>::Wrapper& candidate, Query<Pipe>& q)
     {
+      if (!isnil (extractID("make", q)))
+        return false; // let the query fail here,
+                     //  so the invoking factory will go ahead
+                    //   and create a new object.
+      
       const string pipeID   = extractID("pipe", q);
       const string streamID = extractID("stream", q);
       
@@ -188,6 +194,9 @@ namespace lumiera
       
       if (!isnil(pipeID) && !isnil(streamID))
         return fabricate_matching_new_Pipe (q, pipeID, streamID);
+
+      if (!candidate && !isnil(streamID))
+        return fabricate_new_Pipe_for_stream (q, streamID);
       
       q.clear();
       return false;
@@ -197,9 +206,7 @@ namespace lumiera
     MockTable::detect_case (WrapReturn<const ProcPatt>::Wrapper& candidate, Query<const ProcPatt>& q)
     {
       if (!isnil (extractID("make", q)))
-        return false; // let the query fail here,
-                     //  so the invoking factory will go ahead
-                    //   and create a new object.
+        return false; // failure triggers creation...
       
       const string streamID = extractID("stream", q);
       if (!candidate && !isnil(streamID))
diff --git a/tests/53session.tests b/tests/53session.tests
index dbf85bc75..64946fcf2 100644
--- a/tests/53session.tests
+++ b/tests/53session.tests
@@ -6,11 +6,12 @@ PLANNED "AddClip_test" AddClip_test <<END
 END
 
 
-PLANNED "DefsManagerImpl_test" DefsManagerImpl_test <<END
+PLANNED "DefsManager_test" DefsManager_test <<END
 END
 
 
-PLANNED "DefsManager_test" DefsManager_test <<END
+TEST "DefsManagerImpl_test" DefsManagerImpl_test <<END
+return: 0
 END
 
 

From a869c7107774fe6b4d85e7600033dcacc8011bf3 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Tue, 8 Apr 2008 04:39:07 +0200
Subject: [PATCH 27/36] Defaults Manager finished for now ...passes high level
 test (with help by the mock 'resolution engine')    ;-)

---
 src/common/query/mockconfigrules.cpp          |  5 ++--
 src/common/query/mockconfigrules.hpp          |  6 ++---
 tests/53session.tests                         |  3 ++-
 .../proc/mobject/session/defsmanagertest.cpp  | 26 +++++++++++++++++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp
index ddc7bd57a..c8b9f774b 100644
--- a/src/common/query/mockconfigrules.cpp
+++ b/src/common/query/mockconfigrules.cpp
@@ -100,7 +100,7 @@ namespace lumiera
       item<cPP> (answer_, "stream(default)")  = item<cPP> (answer_,"stream(video)"); // set up a default stream
       
       answer_->insert (entry_Struct<Pipe> ("pipe(master), stream(video)"));
-      item<Pipe> (answer_, "default(P)") = item<Pipe>(answer_,"pipe(master), stream(video)");
+      item<Pipe> (answer_, "") = item<Pipe>(answer_,"pipe(master), stream(video)");//   use as default
     }
     
     
@@ -122,7 +122,7 @@ namespace lumiera
     }
     /** special case: create a new pipe for a specific stream ID */
     bool 
-    MockTable::fabricate_new_Pipe_for_stream (Query<Pipe>& q, string const& streamID)
+    MockTable::fabricate_just_new_Pipe (Query<Pipe>& q )
     {
       typedef WrapReturn<Pipe>::Wrapper Ptr;
       
@@ -147,6 +147,7 @@ namespace lumiera
     bool 
     MockTable::set_new_mock_solution (Query<TY>& q, typename WrapReturn<TY>::Wrapper& obj)
     {
+      answer_->erase (q.asKey());
       answer_->insert (entry<TY> (q, obj));
       return true;
     }
diff --git a/src/common/query/mockconfigrules.hpp b/src/common/query/mockconfigrules.hpp
index dba328754..f5bea3264 100644
--- a/src/common/query/mockconfigrules.hpp
+++ b/src/common/query/mockconfigrules.hpp
@@ -111,7 +111,7 @@ namespace lumiera
         template<class TY> 
         bool detect_case (typename WrapReturn<TY>::Wrapper&, Query<TY>& q);
         bool fabricate_matching_new_Pipe (Query<Pipe>& q, string const& pipeID, string const& streamID);
-        bool fabricate_new_Pipe_for_stream (Query<Pipe>& q, string const& streamID);
+        bool fabricate_just_new_Pipe (Query<Pipe>& q);
         bool fabricate_ProcPatt_on_demand (Query<const ProcPatt>& q, string const& streamID);
         
         template<class TY>
@@ -195,8 +195,8 @@ namespace lumiera
       if (!isnil(pipeID) && !isnil(streamID))
         return fabricate_matching_new_Pipe (q, pipeID, streamID);
 
-      if (!candidate && !isnil(streamID))
-        return fabricate_new_Pipe_for_stream (q, streamID);
+      if (!candidate && (!isnil(streamID) || !isnil(pipeID)))
+        return fabricate_just_new_Pipe (q);
       
       q.clear();
       return false;
diff --git a/tests/53session.tests b/tests/53session.tests
index 64946fcf2..887cbdf4c 100644
--- a/tests/53session.tests
+++ b/tests/53session.tests
@@ -6,7 +6,8 @@ PLANNED "AddClip_test" AddClip_test <<END
 END
 
 
-PLANNED "DefsManager_test" DefsManager_test <<END
+TEST "DefsManager_test" DefsManager_test <<END
+return: 0
 END
 
 
diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp
index 1e66a0553..5f5ed686e 100644
--- a/tests/components/proc/mobject/session/defsmanagertest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagertest.cpp
@@ -27,6 +27,7 @@
 #include "proc/asset.hpp"
 #include "proc/asset/pipe.hpp"
 #include "common/query.hpp"
+#include "common/configrules.hpp"   ///////TODO just temp
 #include "proc/assetmanager.hpp"
 #include "proc/mobject/session.hpp"
 
@@ -46,6 +47,9 @@ namespace asset
     using lumiera::Query;
     using lumiera::query::normalizeID;
     
+    using lumiera::ConfigRules;               ////TODO just temp
+    using lumiera::query::QueryHandler;      ////TODO just temp
+    
     
     /** shortcut: run just a query
      *  without creating new instances
@@ -60,7 +64,7 @@ namespace asset
     
     
     /***********************************************************************
-     * @test basic behaviour of the defaults manager.
+     * @test basic behaviour of the defaults manager ("the big picture")
      *       <ol><li>retrieving a "default" object repeatedly</li>
      *           <li>retrieving a more constrained "default" object</li>
      *           <li>failure registers a new "default"</li>
@@ -101,7 +105,7 @@ namespace asset
             ASSERT (pipe2 == pipe1);
             pipe2 = asset::Struct::create (Query<Pipe> ());
             ASSERT (pipe2 == pipe1);
-            pipe2 = asset::Struct::create (Query<Pipe> ("default(X)"));
+            pipe2 = asset::Struct::create (Query<Pipe> ("default(P)"));
             ASSERT (pipe2 == pipe1);
           }
         
@@ -144,12 +148,30 @@ namespace asset
           }
         
         
+        /** verify the defaults manager holds only weak refs,
+         *  so if an object goes out of scope, any defaults entries
+         *  are purged silently
+         */
         void verifyRemoval (string pID)
           { 
             Query<Pipe> query_for_pID ("pipe("+pID+")");
             size_t hash;
               {
                 PPipe pipe1 = Session::current->defaults (query_for_pID);
+//
+// this is fine but doesn't work as long as there is another entry in the mock table...
+// ...for now we use hack to overwrite the reference in the mock table                
+//
+                ASSERT (3 == pipe1.use_count());  // that's the problem; it should be 2
+                
+                QueryHandler<Pipe>& typeHandler = ConfigRules::instance();  
+                PPipe pipe2 = asset::Struct::create (pID, "quatsch");
+
+                typeHandler.resolve (pipe2, query_for_pID); // in the mock impl this has the side effect
+                ASSERT (pipe2);                            //  of replacing the mock entry
+                ////////////////////////////////////////////   so from now on the test works as intended....                
+                
+                ASSERT (2 == pipe1.use_count());          
                 hash = pipe1->getID();
               }
              // now AssetManager should hold the only ref

From 97821a0fa2b453e9d7c18b8240dbf6c275cab3c6 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 11 Apr 2008 06:24:27 +0200
Subject: [PATCH 28/36] Design: clarified various details regarding Track
 handling

---
 src/proc/asset/track.hpp           |  9 +++-
 src/proc/mobject/session/track.hpp | 10 ++++
 wiki/renderengine.html             | 75 ++++++++++++++++++++++++++----
 3 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/src/proc/asset/track.hpp b/src/proc/asset/track.hpp
index 6a0ab6c88..a36a6242c 100644
--- a/src/proc/asset/track.hpp
+++ b/src/proc/asset/track.hpp
@@ -1,5 +1,5 @@
 /*
-  TRACK.hpp  -  structural asset holding the configuration of a track in the EDL
+  TRACK.hpp  -  structural asset used as global track identifier
  
   Copyright (C)         Lumiera.org
     2008,               Hermann Vosseler <Ichthyostega@web.de>
@@ -33,7 +33,12 @@ namespace asset
 
 
   /**
-   * Structural Asset holding the configuration of a track in the EDL
+   * Structural Asset using as a global identifier for placing
+   * some object onto a given track. Not to be confused with the "track-MO":
+   * To actually use a track  within an EDL, we need to attach a 
+   * Placement<mobject::session::Track> to the tree-of-tracks of this EDL.
+   * Thus, we have one global track-identifier (this class here), but
+   * maybe several instances (track-MO) within various EDLs
    */
   class Track : public Struct
     {
diff --git a/src/proc/mobject/session/track.hpp b/src/proc/mobject/session/track.hpp
index d4005b97d..2b8f090b9 100644
--- a/src/proc/mobject/session/track.hpp
+++ b/src/proc/mobject/session/track.hpp
@@ -49,6 +49,16 @@ namespace mobject
      * Typically, tracks are used do make default processing pipe connections,
      * define a layer or pan for sound and for for disabling groups
      * of clips. Note tracks are grouped in a tree like fashion.
+     * \par
+     * This Media Object (often refered to as "track-MO") is allways dealt with
+     * locally within one EDL. Client code normally doesn't have to care for creating
+     * or retrieving track-MO. Rather, it referes to the global track-asset-ID. The same
+     * holds true when placing some other Media Object onto a track: the corresponding
+     * placement just refers the global trackID, while the builder automatically retrieves
+     * the matching track-MO for the EDL in question. If some EDL contains several instances
+     * (track-MO) refering to the same trackID (asset), then this causes all objects placed
+     * onto this track to be included several times in the resulting render nodes network
+     * (possibliy with varying placement properties) 
      */
     class Track : public Meta
       {
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index c70827a4f..c60cbb53b 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -792,12 +792,13 @@ TertiaryMid: #99a
 TertiaryDark: #667
 Error: #f88</pre>
 </div>
-<div title="ConfigQuery" modifier="Ichthyostega" modified="200801181309" created="200801181308" tags="def" changecount="4">
+<div title="ConfigQuery" modifier="Ichthyostega" modified="200804110335" created="200801181308" tags="def" changecount="5">
 <pre>Configuration Queries are requests to the system to &quot;create or retrieve an object with //this and that // capabilities&quot;. They are resolved by a rule based system ({{red{planned feature}}}) and the user can extend the used rules for each Session. Syntactically, they are stated in ''prolog'' syntax as a conjunction (=logical and) of ''predicates'', for example {{{stream(mpeg), pipe(myPipe)}}}. Queries are typed to the kind of expected result object: {{{Query&lt;Pipe&gt; (&quot;stream(mpeg)&quot;)}}} requests a pipe excepting/delivering mpeg stream data &amp;mdash; and it depends on the current configuration what &quot;mpeg&quot; means. If there is any stream data producing component in the system, which advertises to deliver {{{stream(mpeg)}}}, and a pipe can be configured or connected with this component, then the [[defaults manager|DefaultsManagement]] will create/deliver a [[Pipe|PipeHandling]] object configured accordingly.
 &amp;rarr; [[Configuration Rules system|ConfigRules]]
+&amp;rarr; [[accessing and integrating configuration queries|ConfigQueryIntegration]]
 </pre>
 </div>
-<div title="ConfigQueryIntegration" modifier="Ichthyostega" modified="200804070308" created="200804070247" tags="overview draft impl" changecount="8">
+<div title="ConfigQueryIntegration" modifier="Ichthyostega" modified="200804110350" created="200804070247" tags="overview draft impl" changecount="17">
 <pre>* planning to embed a YAP Prolog engine
 * currently just integrated by a table driven mock
 * the baseline is a bit more clear by now (4/08)
@@ -810,21 +811,33 @@ Error: #f88</pre>
 
 The key idea is that there is a Rule Base &amp;mdash; partly contained in the session (building on a stock of standard rules supplied with the application). Now, whenever there is the need to get a new object, for adding it to the session or for using associated with another object &amp;mdash; then instead of creating it by a direct hard wired ctor call, we issue a ConfigQuery requesting an object of the given type with some //capabilities// defined by predicates. The same holds true when loading an existing session: some objects won't be loaded back blindly, rather they will be re-created by issuing the config queries again. Especially important is the case of (re)creating a [[processing pattern|ProcPatt]] guiding how to wire up the processing pipeline for some given media.
 
-At various places, instead of requiring a fixed set of capabilities, it is possible to request a &quot;default configured&quot; object instead, specifying just those capabilities we really need to be configured in a specific way. This is done by using the [Defaults Manager|DefaultsManagement] accessible on the [[Session]] interface. Such a default object query may either retrieve an already existing object instance, run further config queries, and finally result in the invocation of a factory for creating new objects &amp;mdash; just as necessary and guarded by the rules.
+At various places, instead of requiring a fixed set of capabilities, it is possible to request a &quot;default configured&quot; object instead, specifying just those capabilities we really need to be configured in a specific way. This is done by using the [[Defaults Manager|DefaultsManagement]] accessible on the [[Session]] interface. Such a default object query may either retrieve an already existing object instance, run further config queries, and finally result in the invocation of a factory for creating new objects &amp;mdash; just as necessary and guarded by the rules.
 
 @@clear(left):display(block):@@
 
 !Components and Relations
 [&gt;img[participating classes|uml/fig131461.png]]
 
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+
+Access point is the interface {{{ConfigRules}}}, which allowes to resolve a ConfigQuery resulting in an object with properties condigured such as to fulfill the query. This whole subsystem employes quite some generic programming, because actually we don't deal with &quot;objects&quot;, but rather with similar instantiations of the same functionality for a collection of different object types. For the purpose of resolving these queries, the actual kind of object is not so much of importance, but on the caller sinde, of course we want to deal with the result of the queries in a typesafe manner.
+Examples for //participating object kinds// are [[pipes|Pipe]], [[processing patterns|ProcPatt]], effect instances, [[tags|Tag]], [[labels|Label]], [[automation data sets|AutomationData]],...
 @@clear(right):display(block):@@
+For this to work, we need each of the //participating object types// to implement a generic interface {{{TypeHandler}}}, which will provide actual C/C++ implementations for the predicates usable on objects of this type within the Prolog rules. The implementation has to make sure that alongside with each config query, there are additional //type constraints// to be regarded. For example, if the client code runs a {{{Query&lt;Pipe&gt;}}}, an additional //type guard// (implemented by a predicate {{{type(pipe)}}} has to be inserted, so only rules and facts in accordance with this type will be used for resolution.
+
 
 !when querying for a [[&quot;default&quot;|DefaultsManagement]] object
 [&lt;img[colaboration when issuing a defaults query|uml/fig131845.png]]
 
 @@clear(left):display(block):@@</pre>
 </div>
-<div title="ConfigRules" modifier="Ichthyostega" modified="200802200145" created="200801171352" tags="overview spec" changecount="11">
+<div title="ConfigRules" modifier="Ichthyostega" modified="200804110334" created="200801171352" tags="overview spec" changecount="13">
 <pre>Many features can be implemented by specifically configuring and wiring some unspecific components. Rather than tie the client code in need of some given feature to these configuration internals, in Lumiera the client can //query // for some kind of object providing the //needed capabilities. // Right from start (summer 2007), Ichthyo had the intention to implement such a feature using sort of a ''declarative database'', e.g. by embedding a Prolog system. By adding rules to the basic session configuration, users should be able to customize the semi-automatic part of Lumiera's behaviour to great extent.
 
 [[Configuration Queries|ConfigQuery]] are used at various places, when creating and adding new objects, as well when building or optimizing the render engine node network.
@@ -843,6 +856,7 @@ Actually posing such an configuration query, for example to the [[Defaults Manag
 !Implementation
 At start and for debugging/testing, there is an ''dummy'' implementation using a map with predefined queries and answers. But for the real system, the idea is to embed a ''YAP Prolog'' engine to run the queries. This includes the task of defining and loading a set of custom predicates, so the rule system can interact with the object oriented execution environment, for example by transforming some capability predicate into virtual calls to a corresponding object interface. We need a way for objects to declare some capability predicates, together with a functor that can be executed on an object instance (and further parameters) in the cause of the evaluation of some configuration query. Type safety and diagnostics play an important role here, because effectively the rule base is a pool of code open for arbitray additions from the user session.
 &amp;rarr; [[considerations for a Prolog based implementation|QueryImplProlog]]
+&amp;rarr; [[accessing and integrating configuration queries|ConfigQueryIntegration]]
 &amp;rarr; see {{{src/common/query/mockconfigrules.cpp}}} for the table with the hard wired (mock) answers
 
 
@@ -988,8 +1002,9 @@ After beeing processed by the Builder, we get the following Render Engine config
 [img[Example1: generated Render Engine|uml/fig129029.png]]
 </pre>
 </div>
-<div title="Example2" modifier="Ichthyostega" created="200706220251" tags="example" changecount="1">
-<pre>This Example showes the //high level// EDL as well. This needs to be transformed into a Fixture by some facility still to be designed. Basically, each [[Placement]] needs to be queried for this to get the corresponding ExplicitPlacement. The difficult part is to handle possible Placement constraints, e.g. one clip can't be placed at a timespan covered by another clip on the same track. In the current Cinelerra2, all of this is done directly by the GUI actions.
+<div title="Example2" modifier="Ichthyostega" modified="200804100035" created="200706220251" tags="example" changecount="2">
+<pre>{{red{TODO: seemingly this example is slightly outdated, as the implementation of placements is now indirect via LocatingPin objects}}}
+This Example showes the //high level// EDL as well. This needs to be transformed into a Fixture by some facility still to be designed. Basically, each [[Placement]] needs to be queried for this to get the corresponding ExplicitPlacement. The difficult part is to handle possible Placement constraints, e.g. one clip can't be placed at a timespan covered by another clip on the same track. In the current Cinelerra2, all of this is done directly by the GUI actions.
 
 The &amp;raquo;Timeline&amp;laquo; is a sequence of ~MObjects -- note: using the same Object instances -- but now with the calculated ExplicitPlacement, locating the clip at a given time and track. The effect is located absolutely in time as well, but because it is the same Instance, it has the pointer to the ~RelativePlacement, wich basically attaches the effect to the clip. This structure may look complicated, but is easy to process if we go &quot;backward&quot; and just rely on the information contained in the ExplicitPlacement.
 [img[Example2: Clip with Effect and generated Fixture for this EDL|uml/fig128901.png]]
@@ -2283,10 +2298,10 @@ DAMAGE.
 &lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
 ***/</pre>
 </div>
-<div title="Pipe" modifier="Ichthyostega" modified="200802101340" created="200801062110" tags="def decision" changecount="5">
+<div title="Pipe" modifier="Ichthyostega" modified="200804110301" created="200801062110" tags="def decision" changecount="6">
 <pre>Pipes play an central role within the Proc Layer, because for everything placed and handled within the EDL, the final goal is to get it transformed into data which can be retrieved at some pipe's exit port. Pipes are special facilities, rather like inventory, separate and not treated like all the other objects.
 We don't distinguish between &quot;input&quot; and &quot;output&quot; ports &amp;mdash; rather, pipes are thought to be ''hooks for making connections to''. By following this line of thought, each pipe has an input side and an output side and is in itself something like a ''Bus'' or ''processing chain''. Other processing entities like effects and transitions can be placed (attached) at the pipe, resulting them to be appended to form this chain. Likewise, we can place [[wiring requests|WiringRequest]] to the pipe, meaning we want it connected so to send it's output to another destination pipe. The [[Builder]] may generate further wiring requests to fulfil the placement of other entities.
-Thus //Pipes are the basic building blocks// of the whole render network. We distinguish ''global available'' Pipes, which are like the sum groups of a mixing console, and the ''lokal pipe'' or [[source port|ClipSourcePort]] of the individual clips, which exist only within the duration of the corresponding clip. The design //limits the possible kinds of pipes // to these two types &amp;mdash; thus we can build local processing chains at clips and global processing chains at the global pipes of the session and that's all we can do. (because of the flexibility which comes with the concept of [[placements|Placement]], this is no real limitation)
+Thus //Pipes are the basic building blocks// of the whole render network. We distinguish ''global available'' Pipes, which are like the sum groups of a mixing console, and the ''lokal pipe'' or [[source ports|ClipSourcePort]] of the individual clips, which exist only within the duration of the corresponding clip. The design //limits the possible kinds of pipes // to these two types &amp;mdash; thus we can build local processing chains at clips and global processing chains at the global pipes of the session and that's all we can do. (because of the flexibility which comes with the concept of [[placements|Placement]], this is no real limitation)
 
 The GUI can connect the viewer(s) to some pipe (and moreover can use [[probe points|ProbePoint]] placed like effects and connected to some pipe), and likewise, when starting a ''render'', we get the opportunity to specify the pipes to pull the data from. Pulling data from some pipe is the (only) way to activate the render nodes network reachable from this pipe.
 
@@ -2524,13 +2539,13 @@ The system is ''open'' inasmuch every part mirrors the structure of correspondin
 <pre>A data processing node within the Render Engine. Its key feature is the possibility to pull from it one (freely addressable) [[Frame]] of calculated data. Further, each ~ProcNode has the ability to be wired with other nodes and [[Parameter Providers|ParamProvider]]
 </pre>
 </div>
-<div title="ProcPatt" modifier="Ichthyostega" modified="200709212329" created="200709212315" tags="def design" changecount="4">
+<div title="ProcPatt" modifier="Ichthyostega" modified="200804102256" created="200709212315" tags="def design" changecount="5">
 <pre>This special type of [[structural Asset|StructAsset]] represents information how to build some part of the render engine's processing nodes network. It can be thought of as a template or blueprint for construction. Most notably, it is used for creating nodes reading, decoding and delivering source media material to the render network. Each [[media Asset|MediaAsset]] has associated processing patterns describing the codecs and other transformations needed to get at the media data of this asset. (and because media assets are typically compound objects, the referred ~ProcPatt will be compound too). Obviously, the possibilities opened by using processing patterns go far beyond.
 
 Technically, a processing pattern is a list of building instructions, which will be //executed// by the [[Builder]] on the render node network under construction. This implies the possibility to define further instruction kinds when needed in future; at the moment the relevant sorts of instructions are
 * attach the given sequence of nodes to the specified point
 * recursively execute a nested ~ProcPatt
-More specifically, a sequence of nodes is given by a sequence of prototypical effect and codec assets (and from each of them we can create the corresponding render node). And the point to attach these nodes is given by an identifier &amp;mdash; in most cases just &quot;{{current}}&quot;, denoting the point the builder was just working at, when he treated some MObject which in turn yielded this processing pattern in question.
+More specifically, a sequence of nodes is given by a sequence of prototypical effect and codec assets (and from each of them we can create the corresponding render node). And the point to attach these nodes is given by an identifier &amp;mdash; in most cases just &quot;{{{current}}}&quot;, denoting the point the builder was just working at, when he treated some MObject which in turn yielded this processing pattern in question.
 
 Like all [[structural assets|StructAsset]], ~ProcPatt employs a special naming scheme within the asset name field, which directly mirrors its purpose and allows to bind to existing processing pattern instances when needed. The idea is letting all assets in need of a similar processing pattern refer to one shared ~ProcPatt instance. For example, within a MPEG video media asset, at some point there will be a ~ProcPatt labeled &quot;{{{stream(mpeg)}}}&quot;. In consequence, all MPEG video will use the same pattern of node wiring. And, of course, this pattern could be changed, either globally, or by binding a single clip to some other processing pattern (for making a punctual exception from the general rule)
 
@@ -4121,6 +4136,38 @@ Of course, we can place other ~MObjects relative to some track (that's the main
 &amp;rarr; [[Handling of Pipes|PipeHandling]]
 </pre>
 </div>
+<div title="TrackHandling" modifier="Ichthyostega" modified="200804110259" created="200804110013" tags="spec" changecount="23">
+<pre>What //exactly&amp;nbsp;// is denoted by &amp;raquo;Track&amp;laquo; &amp;mdash; //basically&amp;nbsp;// a working area to group media objects placed at this track at various time positions &amp;mdash; varies depending on context:
+* viewed as [[structural asset|StructAsset]], tracks are nothing but global identifiers (possibly with attached tags and description)
+* regarding the structure //within each [[EDL]],// tracks form a tree-like grid, the individual track being attached to this tree by a [[Placement]], thus setting up properties of placement (time reference origin, output connection, layer, pan) which will be inherited down to any objects located on this track and on child tracks, if not overridden more locally.
+* with respect to //object identity,// a given track-ID can have an incarnation or manifestation as real track-object within several [[EDLs|EDL]] (meaning you could select, disable or choose for rendering all objects in any EDL placed onto this track). Moreover, the track-//object// and the //placement&amp;nbsp;// of this track within the tree of tracks of a given EDL are two distinguishable entities (meaning a given track &amp;mdash; with a couple of objects located on it &amp;mdash; could be placed differently several times within the same EDL, for example with different start offset or with different layering, output mode or pan position)
+
+!Identification
+Tracks thus represent a blend of several concepts, but depending on the context it is allways clear which aspect is meant. Seen as [[assets|Asset]], tracks are known by a unique track-ID, which can be either [[queried|ConfigQuery]], or directly refered to by use of the asset-ID (which is a globally known hash). Usually, all referrals are via track-ID, including when you [[place|Placement]] an object onto a track. 
+Under some cincumstances though, especially from within the [[Builder]], we refer to a {{{Placement&lt;Track&gt;}}} rather, denoting a specific instantiation located at a distinct node within the tree of tracks of a given EDL. These latter referrals are always done by direct object reference, e.g. while traversing the track tree (generally there is no way to refer to a placement by name).
+
+!creating tracks
+Similar to [[pipes|Pipe]] and [[processing patterns|ProcPatt]], track-assets need not be created, but rather leap into existence on first referral. On the contrary, you need to explicitly create the {{{Placement&lt;Track&gt;}}} for attaching it to some node within the tree of tracks of an EDL. The public access point for creating such a placement is {{{asset::Struct::create(trackID}}} (i.e. the {{{asset::StructFactory}}}), which, as a convenience shortcut, can also be accessed from the interface of the track-objects within the EDL for adding new child tracks to a given track.
+
+!removal
+Deleting a Track is an operation with drastic consequences, as it will cause the removal of all child tracks and the deletion of //all object placements to this track,// which could cause the resepctive objects to go out of scope (being deleted automatically by the placements or other smart pointer classes in charge of them). On the contrary, removing a {{{Placement&lt;Track&gt;}}} from the tree of tracks of an EDL will just cause all objects placed onto this track to disappear (because they are no longer reachable for the build process). On re-adding it, they will show up again. (This is how things behave based on how we defined the relations of the entities to be. Another question is if we want to make this functionality available to the user. Judging from the use of Ardour's &amp;laquo;Playlists&amp;raquo;, such a feature may be quite helpful).
+
+!using Tracks
+The '''Track Asset''' is a rather static object with limited capabilities. It's main purpose is to be a point of referral. Track assets have a description field and you may assign a list of [[tags|Tag]] to them (which could be used for binding ConfigRules).  Note that track assets are globally known within the session, they can't be limited to just one EDL (but you are allways free not to refer to some track from a given EDL). By virtue of this global nature, you can utilize the track assets to enable/disable a bunch of objects irrespective of what EDL they are located in, and probably it's a good idea to allow the selection of specific tracks for rendering.
+Matters are quite different for the placement of a Track within the tree of tracks of a given EDL, and for placing some media object onto a given track. The track placement defines properties which will be inherited to all objects on this track and on all child tracks and thus plays a key role for wiring the objects up to some output pipe. Typically, the top level track of each EDL has a placement-to &quot;the&quot; video and &quot;the&quot; audio master pipe.
+
+!!!!details to note
+* Tracks are global, but the placement of a track is local within one EDL
+* when objects are placed onto a track, this is done by referal to the global track asset ID. But because this placement of some media object is allways inherently contained within one EDL, the //meaning&amp;nbsp;// of such a placement is to connect to the properties of any track-placement of this given track //within this EDL.//
+* thus tracks-as-ID appear as something global, but tracks-as-propperty-carrier appear to the user as something local and object-like.
+* in an extreme case, you'll add two different placements of a track at different points within the track tree of an EDL. And because the objects placed onto a track refer to the global track-ID, every object &quot;on&quot; this track //within this EDL&amp;nbsp;// will show up two times independently and possibly with different inherited properties (output pipe, layering mode, pan, temporal position)
+* an interesting configuration results from the fact that you can use an EDL as a [[&quot;meta clip&quot; or &quot;virtual clip&quot;|VirtualClip]] within another EDL. In this case, you'll probably configure the tracks of the &quot;inner&quot; EDL such as to send their output not to a global pipe but rather to the [[source ports|ClipSourcePort]] of the virtual clip (which are effectively local pipes). Thus, within the &quot;outer&quot; EDL, you could attach effects to the virutal clip, combine it with transitions and place it onto another track, and any missing properties of this latter placement are to be resolved within the &quot;outer&quot; EDL &lt;br/&gt;(it would be perfectly legal to construct a contrieved example when using the same track-ID within &quot;inner&quot; and the &quot;outer&quot; EDL. Because the Placement of this track will probably be different in the both ~EDLs, the behaviour of this placement could be quite different in the &quot;inner&quot; and the &quot;outer&quot; EDL. All of this may seem weird when discussed here in a textual and logical manner, but when viewed within the context and meaning of the various entities of the application, it's rather the way you'd expect it to be: you work locally and things behave as defined locally)
+* note further, the root of the tree of tracks within each EDL //is itself again a //{{{Placement&lt;Track&gt;}}}. There is no necessitiy for doing it this way, but it seemed more stright forward and logical to Ichthyo, as it allowes for an easy way of configuring some things (like ouput connections) as a default within one EDL. As every track can have a list of child tracks, you'll get the &quot;list of tracks&quot; you'd expect.
+* a nice consequence of the latter is: if you create a new EDL, it automatically gets one top-level track to start with, and this track will get a default configured placement (according to what is defined as [[default|DefaultsManagement]] within the current ConfigRules) &amp;mdash; typically starting at t=0 and being plugged into the master video and master audio pipe
+* nothing prevents us from putting several objects at the same temporal location within one track. If the builder can't derive any additional layering information (which could be provided by some other configuration rules), then //there is no layering precedence// &amp;mdash; simply the object encountered first (or last) wins.
+* obviously, one wants the __edit function__ used to create such an overlapping placement&amp;nbsp; also to create an [[transition|TransitionsHandling]] between the overlapping objects. Meaning this edit function will automatically create an transition processor object and provide it with a placement such as to attach it to the region of overlap.
+</pre>
+</div>
 <div title="TrackPipeEDL" modifier="Ichthyostega" modified="200801062328" created="200711300405" tags="design discuss def decision Builder" changecount="26">
 <pre>''towards a definition of »Track«''. We don't want to tie ourself to some naive and overly simplistic definition, just because it is convenient. For classical (analogue) media, tracks are physical entities dictated by the nature of the process by which the media works. Especially, Tape machines have read/writing heads, which creates fixed tracks to which to route the signals. This is a practical geometric necessity. For digital media, there is no such necessity. We are bound primarily by the editor's habits of working.
 
@@ -4164,6 +4211,14 @@ Using transitions is a very basic task and thus needs viable support by the GUI.
 Because of this experience, ichthyo wants to support a more general case of transitions, which have N output connections, behave similar to their &quot;simple&quot; counterpart, but leave out the mixing step. As a plus, such transitions can be inserted at the source ports of N clips or between any intermediary or final output pipes as well. Any transition processor capable of handling this situation should provide some flag, in order to decide if he can be placed in such a manner. (wichin the builder, encountering a  inconsistently placed transition is just an [[building error|BuildingError]])
 </pre>
 </div>
+<div title="VirtualClip" modifier="Ichthyostega" modified="200804110329" created="200804110321" tags="def" changecount="7">
+<pre>A ''~Meta-Clip'' or ''Virtual Clip'' (both are synonymous) denotes a clip which doesn't just pull media streams out of a source media asset, but rather provides the results of rendering a complete sub-network. In all other respects it behaves exactly like a &quot;real&quot; clip, i.e. it has [[source ports|ClipSourcePort]], can have attached effects (thus forming a local render pipe) and can be placed and combined with other clips. Depending on what is wired to the source ports, we get two flavours:
+* a __placeholder clip__ has no &quot;embedded&quot; content. Rather, by virtue of placements and wiring requests, the output of some other pipe somewhere in the session will be wired to the clip's source ports. Thus, pulling data from this clip will effectively pull from these source pipes wired to it.
+* a __nested EDL__ is like the other ~EDLs in the Session, just that any missing placement properties will be derived from the Virtual Clip, which is thought as to &quot;contain&quot; the objects of the nested EDL. Typically, you'd also [[configure the tracks|TrackHandling]] of the &quot;inner&quot; EDL such as to connect any output to the source ports of the Virtual Clip.
+
+Like any &quot;real&quot; clip, Virtual Clips have a start offset and a length, which will simply translate into an offset of the frame number pulled from the Virtual Clip's source connection or embedded EDL, making it possible to cut, splice, trim and roll them as usual. This of course implies we can have several instances of the same virtual clip with different start offset and length placed differently. The only limitation is that we can't handle cyclic dependencies for pulling data (which has to be detected and flagged as an error by the builder)
+</pre>
+</div>
 <div title="VisitingToolImpl" modifier="Ichthyostega" modified="200802031822" created="200801032003" tags="impl excludeMissing" changecount="21">
 <pre>The ''Visitor Pattern'' is a special form of //double dispatch// &amp;mdash; selecting the function actually to be executed at runtime based both on the concrete type of some tool object //and // the target this tool is applied to. The rationale is to separate some specific implementation details from the basic infrastructure and the global interfaces, which can be limited to describe the fundamental properties and operations, while all details relevant only for some specific sub-problem can be kept together encapsulated in a tool implementation class. Typically, there is some iteration mechanism, allowing to apply these tools to all objects in a given container, a collection or object graph, without knowing the exact type of the target and tool objects. See the [[Visitor Pattern design discussion|VisitorUse]]
 

From 15bab21da827f1dbd4b4fe0f5244c94900f78a58 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Wed, 26 Mar 2008 13:18:26 +0100
Subject: [PATCH 29/36] Merged the timestuff removal, done by simeon (cherry
 picked from commit bc5a301d01ac323bafcc434e33f6043678749f14)

---
 src/lib/Makefile.am         |   2 -
 src/lib/framerate.h         |   1 -
 src/lib/time.c              |  26 ----
 src/lib/time.h              | 279 ------------------------------------
 tests/10timefunctions.tests | 129 -----------------
 tests/Makefile.am           |   4 -
 tests/library/test-llist.c  |   2 +-
 7 files changed, 1 insertion(+), 442 deletions(-)
 delete mode 100644 src/lib/time.c
 delete mode 100644 src/lib/time.h
 delete mode 100644 tests/10timefunctions.tests

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 89da7dc19..77fc26d90 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -24,7 +24,6 @@ liblumi_a_CPPFLAGS = -I$(top_srcdir)/src/
 liblumi_a_SOURCES = \
 	$(liblumi_a_srcdir)/plugin.c \
 	$(liblumi_a_srcdir)/error.c \
-	$(liblumi_a_srcdir)/time.c \
 	$(liblumi_a_srcdir)/framerate.c \
 	$(liblumi_a_srcdir)/mutex.c \
 	$(liblumi_a_srcdir)/rwlock.c \
@@ -35,7 +34,6 @@ liblumi_a_SOURCES = \
 noinst_HEADERS += \
 	$(liblumi_a_srcdir)/plugin.h \
 	$(liblumi_a_srcdir)/error.h \
-	$(liblumi_a_srcdir)/time.h \
 	$(liblumi_a_srcdir)/framerate.h \
 	$(liblumi_a_srcdir)/locking.h \
 	$(liblumi_a_srcdir)/mutex.h \
diff --git a/src/lib/framerate.h b/src/lib/framerate.h
index 6b050c86e..581d7fa78 100644
--- a/src/lib/framerate.h
+++ b/src/lib/framerate.h
@@ -25,7 +25,6 @@
 #include <limits.h>
 
 #include "lib/error.h"
-#include "lib/time.h"
 
 /**
  * @file Framerate calculations, header.
diff --git a/src/lib/time.c b/src/lib/time.c
deleted file mode 100644
index 83bfd9797..000000000
--- a/src/lib/time.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-  time.h  -  Time and frame calculations
-
-  Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "lib/error.h"
-
-LUMIERA_ERROR_DEFINE(TIME_OVERFLOW, "Time overflow");
-LUMIERA_ERROR_DEFINE(TIME_UNDERFLOW, "Time underflow");
-LUMIERA_ERROR_DEFINE(TIME_NEGATIVE, "Time negative");
diff --git a/src/lib/time.h b/src/lib/time.h
deleted file mode 100644
index 26b698742..000000000
--- a/src/lib/time.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-  time.h  -  Time calculations
-
-  Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef LUMIERA_TIME_H
-#define LUMIERA_TIME_H
-
-#include <sys/time.h>
-#include <time.h>
-#include <math.h>
-
-#include "lib/error.h"
-
-/*
- * @file Time calculations.
-  this time functions are small macro like wrapers, they are all inlined for performance reasons
-  time is passed around as pointers, this pointer must never be NULL.
-
-  timehandling is a delicate business, be careful of precision errors accumulating
-
-  lumiera_time is starting from zero, never becomes negative.
-  
-  TODO explain how to use time
-
-*/
-
-/* over or underflow (tried to make a movie which has negative length? or more than some hundreds days?) */
-LUMIERA_ERROR_DECLARE(TIME_OVERFLOW);
-LUMIERA_ERROR_DECLARE(TIME_UNDERFLOW);
-LUMIERA_ERROR_DECLARE(TIME_NEGATIVE);
-
-/*
-  Note: we measure time starting from zero,
-  time never becomes negative
-  (I didnt checked if the time types are signed)
-*/
-typedef struct timeval lumiera_time;
-typedef lumiera_time* LumieraTime;
-
-/**
- * normalize time after operations.
- * used internally
- */
-static inline void
-lumiera_time_normalize (LumieraTime time)
-{
-  REQUIRE (time);
-  if (time->tv_usec >= 1000000)
-    {
-      time->tv_sec += (time->tv_usec / 1000000);
-      time->tv_usec = (time->tv_usec % 1000000);
-    }
-}
-
-
-/**
- * set a time value to zero.
- * @param time Time to clear
- * @return time as given
- */
-static inline LumieraTime
-lumiera_time_clear (LumieraTime time)
-{
-  if(time)
-    {
-      time->tv_sec = 0;
-      time->tv_usec = 0;
-    }
-  return time;
-}
-
-/**
- * get current time.
- * @param time Time to put current time into.
- * @return time as given
- */
-static inline LumieraTime
-lumiera_time_current (LumieraTime time)
-{
-  if (time)
-    {
-      /* gettime should never ever fail in a correct program */
-      if (gettimeofday (time, NULL))
-        LUMIERA_DIE;
-    }
-  return time;
-}
-
-/**
- * init from floating point representation.
- * @param time The time to be set
- * @param fp Time in double
- * @return time as given upon success, NULL if double time given was negative or given time didn't point
- * anywhere
- */
-static inline LumieraTime
-lumiera_time_set_double (LumieraTime time, double fp)
-{
-  if (time)
-    {
-      if (fp >= 0.0)
-        {
-          time->tv_sec = fp;
-          time->tv_usec = round((fp - time->tv_sec) * 1000000.0);
-          return time;
-        }
-      else
-        {
-          time->tv_sec = (time_t)-1;
-          time->tv_usec = (suseconds_t)-1;
-          lumiera_error_set(LUMIERA_ERROR_TIME_NEGATIVE);
-        }
-    }
-  return NULL;
-}
-
-/**
- * initialize with seconds and microseconds.
- * @param time Time to set
- * @param sec Seconds to set
- * @param usec Microseconds to set
- * @param Time as given
- */
-static inline LumieraTime
-lumiera_time_init (LumieraTime time, time_t sec, suseconds_t usec)
-{
-  if (time)
-    {
-      time->tv_sec = sec;
-      time->tv_usec = usec;
-      lumiera_time_normalize (time);
-    }
-  return time;
-}
-
-/**
- * get the seconds part from a time.
- * @param time Time to get seconds from
- * @return Seconds elapsed, -1 on error
- */
-static inline time_t
-lumiera_time_sec (LumieraTime time)
-{
-  if (time)
-    return time->tv_sec;
-  else
-    return (time_t)-1;
-}
-
-/**
- * get the microseconds part of a time.
- * @param time Time to get microseconds from
- * @return Microseconds elapsed, -1 on error
- */
-static inline suseconds_t
-lumiera_time_usec (LumieraTime time)
-{
-  if (time)
-    return time->tv_usec;
-  else
-    return (suseconds_t)-1;
-}
-
-/**
- * convert to floating point repesentation.
- * @param time Time to get floating point representation from
- * @return Floating point representation of time. NAN on error.
- */
-static inline double
-lumiera_time_double_get (LumieraTime time)
-{
-  if (time)
-    {
-      double fp;
-
-      fp = time->tv_sec;
-      fp += time->tv_usec / 1000000.0;
-      return fp;
-    }
-  return NAN;
-}
-
-
-/**
- * copy time
- * @param dest Time-pointer to copy to
- * @param src Time-source to copy from
- * @return dest as given
- */
-static inline LumieraTime
-lumiera_time_copy (LumieraTime dest, const LumieraTime src)
-{
-  if (dest && src)
-    {
-      dest->tv_sec = src->tv_sec;
-      dest->tv_usec = src->tv_usec;
-    }
-  return dest;
-}
-
-/**
- * add time.
- * @param dest The result of the add
- * @param src Time to add to dest
- * @return dest as given, or NULL on overflow.
- */
-static inline LumieraTime
-lumiera_time_add (LumieraTime dest, const LumieraTime src)
-{
-  if (dest && src)
-    {
-      time_t t = dest->tv_sec;
-
-      dest->tv_sec += src->tv_sec;
-      dest->tv_usec += src->tv_usec;
-
-      lumiera_time_normalize (dest);
-
-      if (dest->tv_sec < t)
-        {
-          lumiera_error_set (LUMIERA_ERROR_TIME_OVERFLOW);
-          return NULL;
-        }
-    }
-  return dest;
-}
-
-/**
- * substact time.
- * @param dest The result of subtract
- * @param src Time to subtract from dest
- * @return dest as given, or NULL on underflow.
- */
-static inline LumieraTime
-lumiera_time_sub (LumieraTime dest, const LumieraTime src)
-{
-  if (dest && src)
-    {
-      time_t t = dest->tv_sec;
-
-      dest->tv_sec -= src->tv_sec;
-      if (dest->tv_usec >= src->tv_usec)
-        dest->tv_usec -= src->tv_usec;
-      else
-        {
-          --dest->tv_sec;
-          dest->tv_usec += 1000000 - src->tv_usec;
-        }
-
-      lumiera_time_normalize (dest);
-
-      if (dest->tv_sec > t)
-        {
-          lumiera_error_set (LUMIERA_ERROR_TIME_UNDERFLOW);
-          return NULL;
-        }
-    }
-  return dest;
-}
-
-
-#endif
diff --git a/tests/10timefunctions.tests b/tests/10timefunctions.tests
deleted file mode 100644
index 835e1a918..000000000
--- a/tests/10timefunctions.tests
+++ /dev/null
@@ -1,129 +0,0 @@
-
-TESTING "Time functions" ./test-time
-
-TEST "time init" init 15 500000 <<END
-out: 15 500000
-END
-
-TEST "time normalize" init 0 1500000 <<END
-out: 1 500000
-END
-
-TEST "time to float" todouble 15 500000 <<END
-out: 15.5
-END
-
-TEST "time to float, NULL gives a NaN" todoublenull <<END
-out: nan
-END
-
-TEST "float to time" fromdouble 33.6666666661 <<END
-out: 33 666667
-END
-
-TEST "float to time, round down" fromdouble 0.00000049 <<END
-out: 0 0
-END
-
-TEST "float to time, round up" fromdouble 0.0000005 <<END
-out: 0 1
-END
-
-TEST "current time" currenttime <<END
-return: 0
-END
-
-TEST "add time, normalized" add 1000001 2000002 <<END
-out: 3 3
-END
-
-TEST "substract time, normalized" sub 3000003 2000002 <<END
-out: 1 1
-END
-
-PLANNED "overflow"
-PLANNED "underflow"
-
-# frame 1 begins at time 0
-TEST "time to frame NTSC frame 1 begin" ntscframefromtime 0 0 <<END
-out: 1
-END
-
-# and ends at 33365
-TEST "time to frame NTSC frame 1 end" ntscframefromtime 0 33365 <<END
-out: 1
-END
-
-# thus 33366 is start of frame 2
-TEST "time to frame NTSC frame 2 begin" ntscframefromtime 0 33366 <<END
-out: 2
-END
-
-# and 66732 is the end of frame 2
-TEST "time to frame NTSC frame 2 end" ntscframefromtime 0 66732 <<END
-out: 2
-END
-
-# this makes 66733 the start of frame 3
-TEST "time to frame NTSC frame 3 begin" ntscframefromtime 0 66733 <<END
-out: 3
-END
-
-# after 1 hour we are at frame 107893
-TEST "time to frame NTSC after 1hour" ntscframefromtime 3600 0 <<END
-out: 107893
-END
-
-# after 200 days we are at frame 517881601
-TEST "time to frame NTSC after 200 days" ntscframefromtime 17280000 0 <<END
-out: 517882118
-END
-
-
-TEST "frame to time NTSC frame 1" ntscframestart 1 <<END
-out: 0 0
-END
-
-TEST "frame to time NTSC frame 2" ntscframestart 2 <<END
-out: 0 33366
-END
-
-TEST "frame->time->frame conversion 2" ntscframecheck 2 <<END
-out: frame 2 1
-END
-
-TEST "frame->time->frame conversion 3" ntscframecheck 3 <<END
-out: frame 3 2
-END
-TEST "frame->time->frame conversion 4" ntscframecheck 4 <<END
-out: frame 4 3
-END
-TEST "frame->time->frame conversion 5" ntscframecheck 5 <<END
-out: frame 5 4
-END
-TEST "frame->time->frame conversion 6" ntscframecheck 6 <<END
-out: frame 6 5
-END
-TEST "frame->time->frame conversion 7" ntscframecheck 7 <<END
-out: frame 7 6
-END
-TEST "frame->time->frame conversion 8" ntscframecheck 8 <<END
-out: frame 8 7
-END
-TEST "frame->time->frame conversion 9" ntscframecheck 9 <<END
-out: frame 9 8
-END
-
-TEST "frame->time->frame conversion 100000" ntscframecheck 100000 <<END
-out: frame 100000 99999
-END
-
-TEST "frame->time->frame conversion 999999" ntscframecheck 999999 <<END
-out: frame 999999 999998
-END
-
-# how long are N frames on average (beware of precision!)
-PLANNED "frame duration"
-
-# how much frames fall in a certain timerange
-PLANNED "frames in range"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e06a9a25..12962fe2a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,10 +23,6 @@ test_error_SOURCES = $(tests_srcdir)/error/errortest.c
 test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
 test_error_LDADD = liblumi.a -lnobugmt -lpthread -ldl
 
-check_PROGRAMS += test-time
-test_time_SOURCES = $(tests_srcdir)/time/test-time.c
-test_time_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_time_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-locking
 test_locking_SOURCES = \
diff --git a/tests/library/test-llist.c b/tests/library/test-llist.c
index bfaf99c65..c8bd00e41 100644
--- a/tests/library/test-llist.c
+++ b/tests/library/test-llist.c
@@ -23,7 +23,7 @@
 //#include <string.h>
 
 #include "lib/llist.h"
-#include "lib/framerate.h"
+#include "src/lib/error.h"
 
 
 LUMIERA_ERROR_DEFINE(TEST, "test error");

From a03e3c5e73a4c0be2264ac4e4e0f02eb8749837b Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 12 Apr 2008 02:07:16 +0200
Subject: [PATCH 30/36] Merge from backend: wikis, admin-scrits, test.sh (dont
 merge any srcfiles)

---
 Makefile.am                                  |     4 +
 SConstruct                                   |     2 +-
 acinclude.m4                                 |   238 +
 admin/Makefile.am                            |    24 +
 admin/headercheck                            |    25 +
 admin/lumiera_c_skeleton                     |   135 +
 admin/rsync_docs_to_lumieraorg.sh            |     8 +
 src/lib/framerate.c => admin/vgsuppression.c |    22 +-
 admin/vgsuppression_gen.sh                   |     3 +
 configure.ac                                 |     6 +-
 doc/devel/Doxyfile                           |     2 +-
 doc/devel/nobug_flags.txt                    |    57 +
 src/backend/Makefile.am                      |    37 +
 tests/00test.tests                           |     4 +-
 tests/Makefile.am                            |     1 -
 tests/locking/test-condition.c               |    65 -
 tests/test.sh                                |    76 +-
 tests/time/DIR_INFO                          |     1 -
 wiki/backend.html                            |    21 +-
 wiki/compatibility.html                      | 11615 ++++++++++++++++
 wiki/index.html                              |   138 +-
 wiki/support_library.html                    |    37 +-
 wiki/todo.html                               | 11631 +++++++++++++++++
 23 files changed, 23958 insertions(+), 194 deletions(-)
 create mode 100644 acinclude.m4
 create mode 100644 admin/Makefile.am
 create mode 100755 admin/headercheck
 create mode 100755 admin/lumiera_c_skeleton
 create mode 100755 admin/rsync_docs_to_lumieraorg.sh
 rename src/lib/framerate.c => admin/vgsuppression.c (68%)
 create mode 100755 admin/vgsuppression_gen.sh
 create mode 100644 doc/devel/nobug_flags.txt
 create mode 100644 src/backend/Makefile.am
 delete mode 100644 tests/locking/test-condition.c
 delete mode 100644 tests/time/DIR_INFO
 create mode 100644 wiki/compatibility.html
 create mode 100644 wiki/todo.html

diff --git a/Makefile.am b/Makefile.am
index 236a67f8b..bf7ebec19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,12 @@ SUBDIRS =
 # Only use subdirs if really needed, prefer the include scheme below
 #SUBDIRS +=
 
+# administrative tools
+include $(top_srcdir)/admin/Makefile.am
+
 # core
 include $(top_srcdir)/src/lib/Makefile.am
+include $(top_srcdir)/src/backend/Makefile.am
 
 # plugins
 #include $(top_srcdir)/src...
diff --git a/SConstruct b/SConstruct
index 4d2f2ee9c..31278e22b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -179,7 +179,7 @@ def configurePlatform(env):
     if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'C'):
         print 'Did not find the pthread lib or pthread.h, exiting.'
     else:
-       conf.env.Append(CPPFLAGS = ' -DHAVE_PTHREAD_H')
+       conf.env.Append(CPPFLAGS = ' -DHAVE_PTHREAD')
        conf.env.Append(CCFLAGS = ' -pthread')
 
     if conf.CheckCHeader('execinfo.h'):
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 000000000..06af84275
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,238 @@
+dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl
+dnl @summary figure out how to build C programs using POSIX threads
+dnl
+dnl This macro figures out how to build C programs using POSIX threads.
+dnl It sets the PTHREAD_LIBS output variable to the threads library and
+dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
+dnl C compiler flags that are needed. (The user can also force certain
+dnl compiler flags/libs to be tested by setting these environment
+dnl variables.)
+dnl
+dnl Also sets PTHREAD_CC to any special C compiler that is needed for
+dnl multi-threaded programs (defaults to the value of CC otherwise).
+dnl (This is necessary on AIX to use the special cc_r compiler alias.)
+dnl
+dnl NOTE: You are assumed to not only compile your program with these
+dnl flags, but also link it with them as well. e.g. you should link
+dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+dnl $LIBS
+dnl
+dnl If you are only building threads programs, you may wish to use
+dnl these variables in your default LIBS, CFLAGS, and CC:
+dnl
+dnl        LIBS="$PTHREAD_LIBS $LIBS"
+dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+dnl        CC="$PTHREAD_CC"
+dnl
+dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+dnl
+dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
+dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
+dnl default action will define HAVE_PTHREAD.
+dnl
+dnl Please let the authors know if this macro fails on any platform, or
+dnl if you have any other suggestions or comments. This macro was based
+dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
+dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
+dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
+dnl We are also grateful for the helpful feedback of numerous users.
+dnl
+dnl @category InstalledPackages
+dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
+dnl @version 2005-06-15
+dnl @license GPLWithACException
+
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test x"$acx_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+        *solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+        ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+		pthread-config)
+		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+		if test x"$acx_pthread_config" = xno; then continue; fi
+		PTHREAD_CFLAGS="`pthread-config --cflags`"
+		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+		;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_TRY_LINK([#include <pthread.h>],
+                    [pthread_t th; pthread_join(th, 0);
+                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+                    [acx_pthread_ok=yes])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test "x$acx_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+	AC_MSG_CHECKING([for joinable pthread attribute])
+	attr_name=unknown
+	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+                        [attr_name=$attr; break])
+	done
+        AC_MSG_RESULT($attr_name)
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case "${host_cpu}-${host_os}" in
+            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: must compile with cc_r
+        AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
+else
+        PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        acx_pthread_ok=no
+        $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
diff --git a/admin/Makefile.am b/admin/Makefile.am
new file mode 100644
index 000000000..6385eb910
--- /dev/null
+++ b/admin/Makefile.am
@@ -0,0 +1,24 @@
+#  Copyright (C)         Lumiera.org
+#    2008,               Christian Thaeter <ct@pipapo.org>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+admin_srcdir = $(top_srcdir)/admin
+
+noinst_PROGRAMS += vgsuppression
+vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c
+vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+vgsuppression_LDADD = liblumi.a -lnobugmt -lpthread -ldl
+
diff --git a/admin/headercheck b/admin/headercheck
new file mode 100755
index 000000000..ada5e1e53
--- /dev/null
+++ b/admin/headercheck
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This is a small tool which checks that all headers are sufficiently standalone
+# and include anything they need.
+# In future we might extend this to find out bogus includes by predefining (-D)
+# headerguards they include, effectively disableing this include for a test.
+
+find src -name '*.h' | while read header; do
+	echo -e "testing $header"
+	awk 'BEGIN {print "#include \""ARGV[1]"\"\nint main(){"}
+		 /^(struct|enum|class).*[^;]$/{print "\t" $0 " test_" NR "; (void) test_"NR";" }
+		 END {print "\treturn 0;\n}"}' $header >,headertest.c
+	gcc -D_GNU_SOURCE -DEBUG_ALPHA -std=gnu99 -Werror -Wall -I src -c ,headertest.c
+	echo
+done
+
+find src -name '*.hpp' | while read header; do
+	echo -e "testing $header"
+	awk 'BEGIN {print "#include \""ARGV[1]"\"\nint main(){"}
+		 /^(struct|enum|class).*[^;]$/{print "\t" $0 " test_" NR "; (void) test_"NR";" }
+		 END {print "\treturn 0;\n}"}' $header >,headertest.cpp
+	g++ -D_GNU_SOURCE -DEBUG_ALPHA -Werror -Wall -I src -c ,headertest.cpp
+	echo
+done
+
diff --git a/admin/lumiera_c_skeleton b/admin/lumiera_c_skeleton
new file mode 100755
index 000000000..fa8e1c1e3
--- /dev/null
+++ b/admin/lumiera_c_skeleton
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+if test $# -lt 2; then
+cat <<EOF
+usage:
+ $0 name description...
+creates C skeleton files name.h and name.c for lumiera
+and adds them to the Makefile.am in the current dir
+EOF
+exit
+fi
+
+NAME="$1"
+NAME_UPPER="$(echo -n ${NAME} | tr [:lower:] [:upper:])"
+shift
+DESCRIPTION="$*"
+
+test -f ${NAME}.h || cat >${NAME}.h <<EOF
+/*
+  ${NAME}.h  -  ${DESCRIPTION}
+
+  Copyright (C)         Lumiera.org
+    $(date +%Y),               $(git config user.name) <$(git config user.email)>
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef LUMIERA_${NAME_UPPER}_H
+#define LUMIERA_${NAME_UPPER}_H
+
+//TODO: Support library includes//
+
+
+//TODO: Forward declarations//
+
+
+//TODO: Lumiera header includes//
+
+
+//TODO: System includes//
+#include <nobug.h>
+
+
+/**
+ * @file
+ *
+ */
+
+//TODO: declarations go here//
+
+
+#endif
+/*
+// Local Variables:
+// mode: C
+// c-file-style: "gnu"
+// indent-tabs-mode: nil
+// End:
+*/
+EOF
+
+test -f ${NAME}.c || cat >${NAME}.c <<EOF
+/*
+  ${NAME}.c  -  ${DESCRIPTION}
+
+  Copyright (C)         Lumiera.org
+    $(date +%Y),               $(git config user.name) <$(git config user.email)>
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+//TODO: Support library includes//
+
+
+//TODO: Lumiera header includes//
+#include "${PWD##*/}/${NAME}.h"
+
+//TODO: internal/static forward declarations//
+
+
+//TODO: System includes//
+
+
+/**
+ * @file
+ *
+ */
+
+NOBUG_DEFINE_FLAG_PARENT (${NAME}, /*TODO insert parent flag here */);
+
+
+//code goes here//
+
+
+
+/*
+// Local Variables:
+// mode: C
+// c-file-style: "gnu"
+// indent-tabs-mode: nil
+// End:
+*/
+EOF
+
+test -f Makefile.am && ed Makefile.am >/dev/null <<EOF
+/\.c\'/s/\(\$(.*)\)\(.*\)\.c\'/\1\2.c \\\\\\
+	\1\/${NAME}.c/
+/\.h\'/s/\(\$(.*)\)\(.*\)\.h\'/\1\2.h \\\\\\
+	\1\/${NAME}.h/
+wq
+EOF
diff --git a/admin/rsync_docs_to_lumieraorg.sh b/admin/rsync_docs_to_lumieraorg.sh
new file mode 100755
index 000000000..503ce90d6
--- /dev/null
+++ b/admin/rsync_docs_to_lumieraorg.sh
@@ -0,0 +1,8 @@
+#/bin/sh
+
+echo "syncing tiddlywikis"
+rsync -rLz --partial --del --exclude backups wiki/ lumiera.org:/var/www/wiki
+
+echo "syncing doxygen documentation"
+rsync -rz --partial --del doc/devel/html/ lumiera.org:/var/www/doxy
+
diff --git a/src/lib/framerate.c b/admin/vgsuppression.c
similarity index 68%
rename from src/lib/framerate.c
rename to admin/vgsuppression.c
index d8a2fa830..0e1f41fca 100644
--- a/src/lib/framerate.c
+++ b/admin/vgsuppression.c
@@ -1,5 +1,5 @@
 /*
-  framerate.c  -  framerate calculations
+  vgsuppression.c  -  Helper program to generate valgrind suppression files
 
   Copyright (C)         Lumiera.org
     2008,               Christian Thaeter <ct@pipapo.org>
@@ -18,13 +18,21 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#define _GNU_SOURCE
 
-#include "lib/error.h"
+/*
+  just place any problematic calls where valgrind whines about in main (with comments please)
+*/
 
-/**
- * @file Framerate calculations.
- */
+#include "lib/safeclib.h"
 
 
-LUMIERA_ERROR_DEFINE(FRAMERATE_ILLEGAL_TIME, "invalid time given");
-LUMIERA_ERROR_DEFINE(FRAMERATE_ILLEGAL_FRAME, "invalid frame given");
+int
+main ()
+{
+  /* debian etch glibc is lazy about cleaning up TLS */
+  lumiera_tmpbuf_provide (100);
+  lumiera_tmpbuf_freeall ();
+
+  return 0;
+}
diff --git a/admin/vgsuppression_gen.sh b/admin/vgsuppression_gen.sh
new file mode 100755
index 000000000..08814afaa
--- /dev/null
+++ b/admin/vgsuppression_gen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+valgrind --leak-check=yes --show-reachable=yes --gen-suppressions=all ./vgsuppression 2>&1 | sed '/==[0-9]*==/d;'
diff --git a/configure.ac b/configure.ac
index 386bd94b0..78d76c136 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,15 @@ AC_PROG_LIBTOOL
 # test for headers
 #
 AC_STDC_HEADERS
-AC_CHECK_HEADER([pthread.h], AC_DEFINE(HAVE_PTHREAD_H))
 AC_CHECK_HEADER([nobug.h], AC_DEFINE(HAVE_NOBUG_H))
 AC_CHECK_HEADER([execinfo.h], AC_DEFINE(HAVE_EXECINFO_H))
 # there is a warning in nobug, disabled til fixed AC_CHECK_HEADER([valgrind/valgrind.h], AC_DEFINE(HAVE_VALGRIND_VALGRIND_H))
 
+ACX_PTHREAD
+##AM_CONDITIONAL([HAVE_THREADING], [test x"$acx_pthread_ok" = xyes])
+
+
+
 #
 # user options
 #
diff --git a/doc/devel/Doxyfile b/doc/devel/Doxyfile
index 2f90301f0..1d6c5f87c 100644
--- a/doc/devel/Doxyfile
+++ b/doc/devel/Doxyfile
@@ -44,7 +44,7 @@ SUBGROUPING            = YES
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
+EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = YES
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
diff --git a/doc/devel/nobug_flags.txt b/doc/devel/nobug_flags.txt
new file mode 100644
index 000000000..325141acb
--- /dev/null
+++ b/doc/devel/nobug_flags.txt
@@ -0,0 +1,57 @@
+
+NoBug debugging flags hierachy
+==============================
+
+NoBug logging is controlled by flags which can be configured with the
+NOBUG_LOG environment variable. This flags can be hierachically
+organized.
+
+The documentation about this hierachy is maintained here:
+
+ (PLANNED, not all are implemented yet)
+
+all                                     # global logging
+  lumiera                               # standard
+    library                             # all support library
+      plugin                            # plugin loader
+    backend                             # all backend
+      file_all                          # filehandling subsystem
+        file                            # file access
+        filedescriptor                  # internal filedescriptors
+        filehandle                      # posix filehandles
+        filehandlecache                 # mrucache for filehandles
+      map_all                           # file mapping subsystem
+      cache_all                         # caching subsystem
+      scheduler_all                     # all scheduler
+        threads                         # threadpool management
+        tasks                           # work requests
+          hard                          # high priority queue
+          idle                          # low priority queue
+    proc                                # all proc
+    gui                                 # all gui
+  detail                                # highly expensive logging
+    profiler                            # performance stats
+
+event                                   # controling events
+  ui                                    # by user interface
+  script                                # by script
+
+Explanation
+-----------
+
+We have 2 main log flag hierachies, 'all' and 'event'.
+ * 'all' reflects the application progress and will be used for
+   debugging the application by the programmers. This is exposed in 2
+   subgroups: 'lumiera' which is used for normal application logging
+   and, 'detail' which contains logging which might be time critical,
+   expensive or of very high volume.
+ * 'event' logs user actions like GUI clicking, menu selections giving
+   an idea how a bug was triggered.
+
+Later on this main hierachies will run in different ringbuffers.
+
+In Short
+--------
+
+use NOBUG_LOG=lumiera
+
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
new file mode 100644
index 000000000..5f693f8bf
--- /dev/null
+++ b/src/backend/Makefile.am
@@ -0,0 +1,37 @@
+#  Copyright (C)         Lumiera.org
+#    2008,               Christian Thaeter <ct@pipapo.org>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+liblumibackend_a_srcdir = $(top_srcdir)/src/backend
+noinst_LIBRARIES += liblumibackend.a
+
+liblumibackend_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
+liblumibackend_a_CPPFLAGS = -I$(top_srcdir)/src/
+
+liblumibackend_a_SOURCES = \
+	$(liblumibackend_a_srcdir)/backend.c \
+	$(liblumibackend_a_srcdir)/file.c \
+	$(liblumibackend_a_srcdir)/filehandle.c \
+	$(liblumibackend_a_srcdir)/filedescriptor.c \
+	$(liblumibackend_a_srcdir)/filehandlecache.c
+
+noinst_HEADERS += \
+	$(liblumibackend_a_srcdir)/backend.h \
+	$(liblumibackend_a_srcdir)/file.h \
+	$(liblumibackend_a_srcdir)/filehandle.h \
+	$(liblumibackend_a_srcdir)/filedescriptor.h \
+	$(liblumibackend_a_srcdir)/filehandlecache.h
+
diff --git a/tests/00test.tests b/tests/00test.tests
index 0b894982b..4d8781629 100644
--- a/tests/00test.tests
+++ b/tests/00test.tests
@@ -1,4 +1,4 @@
-TESTING "test system selftest" cat
+TESTING "test system selftest" /bin/cat
 
 TEST "test cat'ing stdin to stdout" <<END
 in: foo: bar
@@ -7,7 +7,7 @@ return: 0
 END
 
 TEST "test stderr, cat'ing noonexistant file" ,nonexistent_file <<END
-err: cat: ,nonexistent_file: No such file or directory
+err: /bin/cat: ,nonexistent_file: No such file or directory
 return: 1
 END
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 12962fe2a..1315ce185 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,6 @@ test_error_SOURCES = $(tests_srcdir)/error/errortest.c
 test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
 test_error_LDADD = liblumi.a -lnobugmt -lpthread -ldl
 
-
 check_PROGRAMS += test-locking
 test_locking_SOURCES = \
 	$(tests_srcdir)/locking/test-locking.c \
diff --git a/tests/locking/test-condition.c b/tests/locking/test-condition.c
deleted file mode 100644
index 1e3ca1bf7..000000000
--- a/tests/locking/test-condition.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-  test-locking.c  -  test locking functions
-
-  Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-#include "lib/condition.h"
-
-LUMIERA_ERROR_DEFINE(TEST, "test error");
-
-#if 0
-waiting_thread()
-{
-  lock;
-  wait;
-  unlock;
-}
-
-
-signaling_thread()
-{
-  signal();
-}
-#endif
-
-
-int
-main (int argc, char** argv)
-{
-  NOBUG_INIT;
-
-  if (argc == 1)
-    return 0;
-
-  if (!strcmp(argv[1], "conditionforgotunlock"))
-    {
-      lumiera_condition c;
-      lumiera_condition_init (&c);
-
-      lumiera_conditionlock NOBUG_CLEANUP(lumiera_conditionlock_ensureunlocked) l;
-      lumiera_conditionlock_init (&l, &c, LUMIERA_LOCKED);
-    }
-  else
-    return 1;
-
-  return 0;
-}
diff --git a/tests/test.sh b/tests/test.sh
index b692b3959..77bac66bf 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -29,7 +29,7 @@
 export LC_ALL=C
 
 arg0="$0"
-srcdir=$(dirname "$arg0")
+srcdir="$(dirname "$arg0")"
 
 ulimit -S -t 1 -v 524288
 valgrind=""
@@ -45,7 +45,7 @@ else
 fi
 
 echo
-echo ================ ${0##*/} ================
+echo "================ ${0##*/} ================"
 
 TESTCNT=0
 SKIPCNT=0
@@ -84,7 +84,7 @@ function TEST()
                 echo "$arg" >>,expect_stderr
                 ;;
             'return')
-                expect_return=$arg
+                expect_return="$arg"
                 ;;
             *)
                 echo "UNKOWN TEST COMMAND '$cmd'" 1>&2
@@ -95,7 +95,7 @@ function TEST()
 	echo -n "TEST $name: "
 	echo -en "\nTEST $name: $* " >>,testlog
 
-        case $TESTMODE in
+        case "$TESTMODE" in
         *FAST*)
             if grep "^TEST $name: .* FAILED" ,testlog.pre >&/dev/null; then
                 MSGOK=" (fixed)"
@@ -121,39 +121,45 @@ function TEST()
 
         fails=0
 
-
-        if test -f ,send_stdin; then
-            cat ,send_stdin | $valgrind $TESTBIN "$@" 2>,stderr >,stdout
-        else
-            $valgrind $TESTBIN "$@" 2>,stderr >,stdout
-        fi &>/dev/null
-        return=$?
-
         echo -n >,testtmp
 
-        if test -f ,expect_stdout; then
-            if ! cmp ,expect_stdout ,stdout &>/dev/null; then
-                echo "unexpected data on stdout" >>,testtmp
-                grep -v ': \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\):' <,stdout >,tmp
-                diff -ua ,expect_stdout ,tmp >>,testtmp
-                rm ,tmp
-                ((fails+=1))
-            fi
-        fi
-
-        if test -f ,expect_stderr; then
-            if ! cmp ,expect_stderr ,stderr &>/dev/null; then
-                echo "unexpected data on stderr" >>,testtmp
-                grep -v ': \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\):' <,stderr >,tmp
-                diff -ua ,expect_stderr ,tmp >>,testtmp
-                rm ,tmp
-                ((fails+=1))
-            fi
-        fi
-
-        if test $expect_return != $return; then
-            echo "unexpected return value $return" >>,testtmp
+        if ! test -x $TESTBIN; then
+            echo -n >,stdout
+            echo "test binary '$TESTBIN' not found" >,stderr
             ((fails+=1))
+
+        else
+            if test -f ,send_stdin; then
+                cat ,send_stdin | $valgrind $TESTBIN "$@" 2>,stderr >,stdout
+            else
+                $valgrind $TESTBIN "$@" 2>,stderr >,stdout
+            fi &>/dev/null
+            return=$?
+
+            if test -f ,expect_stdout; then
+                if ! cmp ,expect_stdout ,stdout &>/dev/null; then
+                    echo "unexpected data on stdout" >>,testtmp
+                    grep -v ': \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\):' <,stdout >,tmp
+                    diff -ua ,expect_stdout ,tmp >>,testtmp
+                    rm ,tmp
+                    ((fails+=1))
+                fi
+            fi
+
+            if test -f ,expect_stderr; then
+                if ! cmp ,expect_stderr ,stderr &>/dev/null; then
+                    echo "unexpected data on stderr" >>,testtmp
+                    grep -v ': \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\):' <,stderr >,tmp
+                    diff -ua ,expect_stderr ,tmp >>,testtmp
+                    rm ,tmp
+                    ((fails+=1))
+                fi
+            fi
+
+            if test "$expect_return" != "$return"; then
+                echo "unexpected return value $return" >>,testtmp
+                ((fails+=1))
+            fi
         fi
 
 	if test $fails -eq 0; then
@@ -191,7 +197,7 @@ function RUNTESTS()
     if test \( ! "${TESTSUITES/*,*/}" \) -a "$TESTSUITES"; then
         TESTSUITES="{$TESTSUITES}"
     fi
-    for t in $(eval echo $srcdir/*$TESTSUITES*.tests); do
+    for t in $(eval echo "$srcdir/*$TESTSUITES*.tests"); do
         echo "$t"
     done | sort | uniq | {
         while read i; do
diff --git a/tests/time/DIR_INFO b/tests/time/DIR_INFO
deleted file mode 100644
index 20a92392c..000000000
--- a/tests/time/DIR_INFO
+++ /dev/null
@@ -1 +0,0 @@
-test time and frame calculations
diff --git a/wiki/backend.html b/wiki/backend.html
index 3cdee6a96..49bfb6727 100644
--- a/wiki/backend.html
+++ b/wiki/backend.html
@@ -789,20 +789,19 @@ Look at [[Overview]] for the current design proposal
 <pre>DataBackend
 </pre>
 </div>
-<div title="File" modifier="CehTeh" modified="200706271509" created="200706201525" changecount="5">
-<pre>'File' is the superclass of all possible filetypes, it has a weak reference to a FileHandle which is managed in FileHandleCache, on creation only the existence (when reading) or access for write for new files are checked. 'File' stores some generic metadata about the underlying file and intended use. But actual opening is done on demand.
+<div title="File" modifier="CehTeh" modified="200803271341" created="200803271035" changecount="2">
+<pre>[[File]] associates a filename with the underlying FileDescriptor. This allows [[File]]s which have serveral names (hardlinks) to share a underlying backend.</pre>
+</div>
+<div title="FileDescriptor" modifier="CehTeh" modified="200803271036" created="200706201525" changecount="2">
+<pre>'FileDescriptor' is the superclass of all possible filetypes, it has a weak reference to a FileHandle which is managed in FilehandleCache, on creation only the existence (when reading) or access for write for new files are checked. 'FileDescriptor' stores some generic metadata about the underlying file and intended use. But actual opening is done on demand.
 
-Files content is memory mapped into the process address space, this is managed by FileMap objects and a FileMapCache.
+The content is memory mapped into the process address space, this is managed by FileMap objects and a FileMapCache.
 </pre>
 </div>
 <div title="FileHandle" modifier="CehTeh" modified="200706202208" created="200706201535" changecount="2">
 <pre>'FileHandle's are managed by the FileHandleCache, they are just storing the underlying OS file handles and managed in a lazy/weak way, (re)opened when needed and aging in the cache when not needed, since the amount of open file handles is limited aged ones will be closed and reused when the system needs to open another file.
 </pre>
 </div>
-<div title="FileHandleCache" modifier="CehTeh" modified="200706271508" created="200706201548" changecount="5">
-<pre>'FileHandleCache' storing a finite maximum number of [[FileHandle]]s as a list. As long the configured maximum of open files is not reached new file handles are stored at the begin of the list. Whenever a filehandle is accessed it is moved to the begin of the list too. Unused filehandles propagate towards the end of the list. When the maximum of open filehandles is reached, aged filehandles are closed and taken from the end.
-</pre>
-</div>
 <div title="FileMap" modifier="MichaelPloujnikov" modified="200706270315" created="200706201921" changecount="11">
 <pre>Each 'FileMap' object contains many [[Frame]]s. The actual layout depends on the type of the [[File]]. Mappings need to be page aligned while [[Frame]]s can be anywhere within a file and dynamically sized.
 
@@ -816,6 +815,10 @@ FileMap objects are transparent to the application. It will only requests [[Fram
 Whenever a FileMap is in use, it is checked out into an in-use list where it is not subject to aging.
 </pre>
 </div>
+<div title="FilehandleCache" modifier="CehTeh" modified="200803271025" created="200706201548" changecount="2">
+<pre>'FilehandleCache' storing a finite maximum number of [[FileHandle]]s as a list. As long the configured maximum of open files is not reached new file handles are stored at the begin of the list. Whenever a filehandle is accessed it is moved to the begin of the list too. Unused filehandles propagate towards the end of the list. When the maximum of open filehandles is reached, aged filehandles are closed and taken from the end.
+</pre>
+</div>
 <div title="Frame" modifier="CehTeh" modified="200706271506" created="200706202115" changecount="13">
 <pre>'Frames' are the smallest datablocks handled by the Backend. The application tells the Backend to make [[File]]s available and then only requests Frames from the Backend. All other datastructures of the backend are private.
 
@@ -1254,7 +1257,7 @@ Storage and logging of EDL's, unlimited undo, database,...
 When to Cache and when not to cache, aka instant [[Frame]] reuse
 </pre>
 </div>
-<div title="Overview" modifier="CehTeh" modified="200706271504" created="200706200040" changecount="12">
+<div title="Overview" modifier="CehTeh" modified="200803271022" created="200706200040" changecount="13">
 <pre>Whenever Lumiera needs to access data this is done through the DataBackend described here. 
 
 There are two main kinds how data is handled:
@@ -1263,7 +1266,7 @@ There are two main kinds how data is handled:
 
 The backend uses memory mapping to make data available to the program. This is little different to more common open/read/write/close file access while giving superior performance and much better memory utilization.
 
-The data backend must be capable to handle more data than will fit into the memory or even address space on 32 bit architectures.  Moreover a project may access more files than the OS can handle at a time, thus the for [[File]]s used by the Backend it needs a FileHandleCache to manage filehandles dynamically.
+The data backend must be capable to handle more data than will fit into the memory or even address space on 32 bit architectures.  Moreover a project may access more files than the OS can handle at a time, thus the for [[File]]s used by the Backend it needs a FilehandleCache to manage filehandles dynamically.
 
 Which parts of a File are actually mapped to physical RAM is managed by the kernel, it keeps a FileMapCache to manage the [[FileMap]]s we've set up.
 
diff --git a/wiki/compatibility.html b/wiki/compatibility.html
new file mode 100644
index 000000000..ad54ca4e8
--- /dev/null
+++ b/wiki/compatibility.html
@@ -0,0 +1,11615 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<script type="text/javascript">
+//<![CDATA[
+var version = {title: "TiddlyWiki", major: 2, minor: 2, revision: 3, date: new Date("Jun 17, 2007"), extensions: {}};
+//]]>
+</script>
+<!--
+TiddlyWiki created by Jeremy Ruston, (jeremy [at] osmosoft [dot] com)
+
+Copyright (c) UnaMesa Association 2004-2007
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+Neither the name of the UnaMesa Association nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+-->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<!--PRE-HEAD-START-->
+<!--{{{-->
+<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>
+<!--}}}-->
+
+<style type="text/css">#contentWrapper {display:none;}</style><div id="SplashScreen" style="border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;"><b>My TiddlyWiki</b> is loading<blink> ...</blink><br><br><span style="font-size: 14px; color:red;">Requires Javascript.</span></div>
+<!--PRE-HEAD-END-->
+<title> Compatibility - Dependencies and Style </title>
+<style type="text/css">
+#saveTest {display:none;}
+#messageArea {display:none;}
+#copyright {display:none;}
+#storeArea {display:none;}
+#storeArea div {padding:0.5em; margin:1em 0em 0em 0em; border-color:#fff #666 #444 #ddd; border-style:solid; border-width:2px; overflow:auto;}
+#shadowArea {display:none;}
+#javascriptWarning {width:100%; text-align:center; font-weight:bold; background-color:#dd1100; color:#fff; padding:1em 0em;}
+</style>
+<!--POST-HEAD-START-->
+
+<!--POST-HEAD-END-->
+</head>
+<body onload="main();" onunload="if(window.checkUnsavedChanges) checkUnsavedChanges(); if(window.scrubNodes) scrubNodes(document.body);">
+<!--PRE-BODY-START-->
+
+<!--PRE-BODY-END-->
+<div id="copyright">
+Welcome to TiddlyWiki created by Jeremy Ruston, Copyright &copy; 2007 UnaMesa Association
+</div>
+<noscript>
+	<div id="javascriptWarning">This page requires JavaScript to function properly.<br /><br />If you are using Microsoft Internet Explorer you may need to click on the yellow bar above and select 'Allow Blocked Content'. You must then click 'Yes' on the following security warning.</div>
+</noscript>
+<div id="saveTest"></div>
+<div id="backstageCloak"></div>
+<div id="backstageButton"></div>
+<div id="backstageArea"><div id="backstageToolbar"></div></div>
+<div id="backstage">
+	<div id="backstagePanel"></div>
+</div>
+<div id="contentWrapper"></div>
+<div id="contentStash"></div>
+<div id="shadowArea">
+<div title="ColorPalette">
+<pre>Background: #fff
+Foreground: #000
+PrimaryPale: #8cf
+PrimaryLight: #18f
+PrimaryMid: #04b
+PrimaryDark: #014
+SecondaryPale: #ffc
+SecondaryLight: #fe8
+SecondaryMid: #db4
+SecondaryDark: #841
+TertiaryPale: #eee
+TertiaryLight: #ccc
+TertiaryMid: #999
+TertiaryDark: #666
+Error: #f88</pre>
+</div>
+<div title="StyleSheetColors">
+<pre>/*{{{*/
+body {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+
+a {color:[[ColorPalette::PrimaryMid]];}
+a:hover {background-color:[[ColorPalette::PrimaryMid]]; color:[[ColorPalette::Background]];}
+a img {border:0;}
+
+h1,h2,h3,h4,h5,h6 {color:[[ColorPalette::SecondaryDark]]; background:transparent;}
+h1 {border-bottom:2px solid [[ColorPalette::TertiaryLight]];}
+h2,h3 {border-bottom:1px solid [[ColorPalette::TertiaryLight]];}
+
+.button {color:[[ColorPalette::PrimaryDark]]; border:1px solid [[ColorPalette::Background]];}
+.button:hover {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::SecondaryLight]]; border-color:[[ColorPalette::SecondaryMid]];}
+.button:active {color:[[ColorPalette::Background]]; background:[[ColorPalette::SecondaryMid]]; border:1px solid [[ColorPalette::SecondaryDark]];}
+
+.header {background:[[ColorPalette::PrimaryMid]];}
+.headerShadow {color:[[ColorPalette::Foreground]];}
+.headerShadow a {font-weight:normal; color:[[ColorPalette::Foreground]];}
+.headerForeground {color:[[ColorPalette::Background]];}
+.headerForeground a {font-weight:normal; color:[[ColorPalette::PrimaryPale]];}
+
+.tabSelected{color:[[ColorPalette::PrimaryDark]];
+	background:[[ColorPalette::TertiaryPale]];
+	border-left:1px solid [[ColorPalette::TertiaryLight]];
+	border-top:1px solid [[ColorPalette::TertiaryLight]];
+	border-right:1px solid [[ColorPalette::TertiaryLight]];
+}
+.tabUnselected {color:[[ColorPalette::Background]]; background:[[ColorPalette::TertiaryMid]];}
+.tabContents {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::TertiaryPale]]; border:1px solid [[ColorPalette::TertiaryLight]];}
+.tabContents .button {border:0;}
+
+#sidebar {}
+#sidebarOptions input {border:1px solid [[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel {background:[[ColorPalette::PrimaryPale]];}
+#sidebarOptions .sliderPanel a {border:none;color:[[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel a:hover {color:[[ColorPalette::Background]]; background:[[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel a:active {color:[[ColorPalette::PrimaryMid]]; background:[[ColorPalette::Background]];}
+
+.wizard {background:[[ColorPalette::PrimaryPale]]; border:1px solid [[ColorPalette::PrimaryMid]];}
+.wizard h1 {color:[[ColorPalette::PrimaryDark]]; border:none;}
+.wizard h2 {color:[[ColorPalette::Foreground]]; border:none;}
+.wizardStep {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];
+	border:1px solid [[ColorPalette::PrimaryMid]];}
+.wizardStep.wizardStepDone {background::[[ColorPalette::TertiaryLight]];}
+.wizardFooter {background:[[ColorPalette::PrimaryPale]];}
+.wizardFooter .status {background:[[ColorPalette::PrimaryDark]]; color:[[ColorPalette::Background]];}
+.wizard .button {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::SecondaryLight]]; border: 1px solid;
+	border-color:[[ColorPalette::SecondaryPale]] [[ColorPalette::SecondaryDark]] [[ColorPalette::SecondaryDark]] [[ColorPalette::SecondaryPale]];}
+.wizard .button:hover {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::Background]];}
+.wizard .button:active {color:[[ColorPalette::Background]]; background:[[ColorPalette::Foreground]]; border: 1px solid;
+	border-color:[[ColorPalette::PrimaryDark]] [[ColorPalette::PrimaryPale]] [[ColorPalette::PrimaryPale]] [[ColorPalette::PrimaryDark]];}
+
+#messageArea {border:1px solid [[ColorPalette::SecondaryMid]]; background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]];}
+#messageArea .button {color:[[ColorPalette::PrimaryMid]]; background:[[ColorPalette::SecondaryPale]]; border:none;}
+
+.popupTiddler {background:[[ColorPalette::TertiaryPale]]; border:2px solid [[ColorPalette::TertiaryMid]];}
+
+.popup {background:[[ColorPalette::TertiaryPale]]; color:[[ColorPalette::TertiaryDark]]; border-left:1px solid [[ColorPalette::TertiaryMid]]; border-top:1px solid [[ColorPalette::TertiaryMid]]; border-right:2px solid [[ColorPalette::TertiaryDark]]; border-bottom:2px solid [[ColorPalette::TertiaryDark]];}
+.popup hr {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::PrimaryDark]]; border-bottom:1px;}
+.popup li.disabled {color:[[ColorPalette::TertiaryMid]];}
+.popup li a, .popup li a:visited {color:[[ColorPalette::Foreground]]; border: none;}
+.popup li a:hover {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; border: none;}
+.popup li a:active {background:[[ColorPalette::SecondaryPale]]; color:[[ColorPalette::Foreground]]; border: none;}
+.popupHighlight {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+.listBreak div {border-bottom:1px solid [[ColorPalette::TertiaryDark]];}
+
+.tiddler .defaultCommand {font-weight:bold;}
+
+.shadow .title {color:[[ColorPalette::TertiaryDark]];}
+
+.title {color:[[ColorPalette::SecondaryDark]];}
+.subtitle {color:[[ColorPalette::TertiaryDark]];}
+
+.toolbar {color:[[ColorPalette::PrimaryMid]];}
+.toolbar a {color:[[ColorPalette::TertiaryLight]];}
+.selected .toolbar a {color:[[ColorPalette::TertiaryMid]];}
+.selected .toolbar a:hover {color:[[ColorPalette::Foreground]];}
+
+.tagging, .tagged {border:1px solid [[ColorPalette::TertiaryPale]]; background-color:[[ColorPalette::TertiaryPale]];}
+.selected .tagging, .selected .tagged {background-color:[[ColorPalette::TertiaryLight]]; border:1px solid [[ColorPalette::TertiaryMid]];}
+.tagging .listTitle, .tagged .listTitle {color:[[ColorPalette::PrimaryDark]];}
+.tagging .button, .tagged .button {border:none;}
+
+.footer {color:[[ColorPalette::TertiaryLight]];}
+.selected .footer {color:[[ColorPalette::TertiaryMid]];}
+
+.sparkline {background:[[ColorPalette::PrimaryPale]]; border:0;}
+.sparktick {background:[[ColorPalette::PrimaryDark]];}
+
+.error, .errorButton {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::Error]];}
+.warning {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::SecondaryPale]];}
+.lowlight {background:[[ColorPalette::TertiaryLight]];}
+
+.zoomer {background:none; color:[[ColorPalette::TertiaryMid]]; border:3px solid [[ColorPalette::TertiaryMid]];}
+
+.imageLink, #displayArea .imageLink {background:transparent;}
+
+.annotation {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; border:2px solid [[ColorPalette::SecondaryMid]];}
+
+.viewer .listTitle {list-style-type:none; margin-left:-2em;}
+.viewer .button {border:1px solid [[ColorPalette::SecondaryMid]];}
+.viewer blockquote {border-left:3px solid [[ColorPalette::TertiaryDark]];}
+
+.viewer table, table.twtable {border:2px solid [[ColorPalette::TertiaryDark]];}
+.viewer th, .viewer thead td, .twtable th, .twtable thead td {background:[[ColorPalette::SecondaryMid]]; border:1px solid [[ColorPalette::TertiaryDark]]; color:[[ColorPalette::Background]];}
+.viewer td, .viewer tr, .twtable td, .twtable tr {border:1px solid [[ColorPalette::TertiaryDark]];}
+
+.viewer pre {border:1px solid [[ColorPalette::SecondaryLight]]; background:[[ColorPalette::SecondaryPale]];}
+.viewer code {color:[[ColorPalette::SecondaryDark]];}
+.viewer hr {border:0; border-top:dashed 1px [[ColorPalette::TertiaryDark]]; color:[[ColorPalette::TertiaryDark]];}
+
+.highlight, .marked {background:[[ColorPalette::SecondaryLight]];}
+
+.editor input {border:1px solid [[ColorPalette::PrimaryMid]];}
+.editor textarea {border:1px solid [[ColorPalette::PrimaryMid]]; width:100%;}
+.editorFooter {color:[[ColorPalette::TertiaryMid]];}
+
+#backstageArea {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::TertiaryMid]];}
+#backstageArea a {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::Background]]; border:none;}
+#backstageArea a:hover {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; }
+#backstageArea a.backstageSelTab {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+#backstageButton a {background:none; color:[[ColorPalette::Background]]; border:none;}
+#backstageButton a:hover {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::Background]]; border:none;}
+#backstagePanel {background:[[ColorPalette::Background]]; border-color: [[ColorPalette::Background]] [[ColorPalette::TertiaryDark]] [[ColorPalette::TertiaryDark]] [[ColorPalette::TertiaryDark]];}
+.backstagePanelFooter .button {border:none; color:[[ColorPalette::Background]];}
+.backstagePanelFooter .button:hover {color:[[ColorPalette::Foreground]];}
+#backstageCloak {background:[[ColorPalette::Foreground]]; opacity:0.6; filter:'alpha(opacity:60)';}
+/*}}}*/</pre>
+</div>
+<div title="StyleSheetLayout">
+<pre>/*{{{*/
+* html .tiddler {height:1%;}
+
+body {font-size:.75em; font-family:arial,helvetica; margin:0; padding:0;}
+
+h1,h2,h3,h4,h5,h6 {font-weight:bold; text-decoration:none;}
+h1,h2,h3 {padding-bottom:1px; margin-top:1.2em;margin-bottom:0.3em;}
+h4,h5,h6 {margin-top:1em;}
+h1 {font-size:1.35em;}
+h2 {font-size:1.25em;}
+h3 {font-size:1.1em;}
+h4 {font-size:1em;}
+h5 {font-size:.9em;}
+
+hr {height:1px;}
+
+a {text-decoration:none;}
+
+dt {font-weight:bold;}
+
+ol {list-style-type:decimal;}
+ol ol {list-style-type:lower-alpha;}
+ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol {list-style-type:decimal;}
+ol ol ol ol ol {list-style-type:lower-alpha;}
+ol ol ol ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol ol ol ol {list-style-type:decimal;}
+
+.txtOptionInput {width:11em;}
+
+#contentWrapper .chkOptionInput {border:0;}
+
+.externalLink {text-decoration:underline;}
+
+.indent {margin-left:3em;}
+.outdent {margin-left:3em; text-indent:-3em;}
+code.escaped {white-space:nowrap;}
+
+.tiddlyLinkExisting {font-weight:bold;}
+.tiddlyLinkNonExisting {font-style:italic;}
+
+/* the 'a' is required for IE, otherwise it renders the whole tiddler in bold */
+a.tiddlyLinkNonExisting.shadow {font-weight:bold;}
+
+#mainMenu .tiddlyLinkExisting,
+	#mainMenu .tiddlyLinkNonExisting,
+	#sidebarTabs .tiddlyLinkNonExisting {font-weight:normal; font-style:normal;}
+#sidebarTabs .tiddlyLinkExisting {font-weight:bold; font-style:normal;}
+
+.header {position:relative;}
+.header a:hover {background:transparent;}
+.headerShadow {position:relative; padding:4.5em 0em 1em 1em; left:-1px; top:-1px;}
+.headerForeground {position:absolute; padding:4.5em 0em 1em 1em; left:0px; top:0px;}
+
+.siteTitle {font-size:3em;}
+.siteSubtitle {font-size:1.2em;}
+
+#mainMenu {position:absolute; left:0; width:10em; text-align:right; line-height:1.6em; padding:1.5em 0.5em 0.5em 0.5em; font-size:1.1em;}
+
+#sidebar {position:absolute; right:3px; width:16em; font-size:.9em;}
+#sidebarOptions {padding-top:0.3em;}
+#sidebarOptions a {margin:0em 0.2em; padding:0.2em 0.3em; display:block;}
+#sidebarOptions input {margin:0.4em 0.5em;}
+#sidebarOptions .sliderPanel {margin-left:1em; padding:0.5em; font-size:.85em;}
+#sidebarOptions .sliderPanel a {font-weight:bold; display:inline; padding:0;}
+#sidebarOptions .sliderPanel input {margin:0 0 .3em 0;}
+#sidebarTabs .tabContents {width:15em; overflow:hidden;}
+
+.wizard {padding:0.1em 1em 0em 2em;}
+.wizard h1 {font-size:2em; font-weight:bold; background:none; padding:0em 0em 0em 0em; margin:0.4em 0em 0.2em 0em;}
+.wizard h2 {font-size:1.2em; font-weight:bold; background:none; padding:0em 0em 0em 0em; margin:0.4em 0em 0.2em 0em;}
+.wizardStep {padding:1em 1em 1em 1em;}
+.wizard .button {margin:0.5em 0em 0em 0em; font-size:1.2em;}
+.wizardFooter {padding:0.8em 0.4em 0.8em 0em;}
+.wizardFooter .status {padding:0em 0.4em 0em 0.4em; margin-left:1em;}
+.wizard .button {padding:0.1em 0.2em 0.1em 0.2em;}
+
+#messageArea {position:fixed; top:2em; right:0em; margin:0.5em; padding:0.5em; z-index:2000; _position:absolute;}
+.messageToolbar {display:block; text-align:right; padding:0.2em 0.2em 0.2em 0.2em;}
+#messageArea a {text-decoration:underline;}
+
+.tiddlerPopupButton {padding:0.2em 0.2em 0.2em 0.2em;}
+.popupTiddler {position: absolute; z-index:300; padding:1em 1em 1em 1em; margin:0;}
+
+.popup {position:absolute; z-index:300; font-size:.9em; padding:0; list-style:none; margin:0;}
+.popup .popupMessage {padding:0.4em;}
+.popup hr {display:block; height:1px; width:auto; padding:0; margin:0.2em 0em;}
+.popup li.disabled {padding:0.4em;}
+.popup li a {display:block; padding:0.4em; font-weight:normal; cursor:pointer;}
+.listBreak {font-size:1px; line-height:1px;}
+.listBreak div {margin:2px 0;}
+
+.tabset {padding:1em 0em 0em 0.5em;}
+.tab {margin:0em 0em 0em 0.25em; padding:2px;}
+.tabContents {padding:0.5em;}
+.tabContents ul, .tabContents ol {margin:0; padding:0;}
+.txtMainTab .tabContents li {list-style:none;}
+.tabContents li.listLink { margin-left:.75em;}
+
+#contentWrapper {display:block;}
+#splashScreen {display:none;}
+
+#displayArea {margin:1em 17em 0em 14em;}
+
+.toolbar {text-align:right; font-size:.9em;}
+
+.tiddler {padding:1em 1em 0em 1em;}
+
+.missing .viewer,.missing .title {font-style:italic;}
+
+.title {font-size:1.6em; font-weight:bold;}
+
+.missing .subtitle {display:none;}
+.subtitle {font-size:1.1em;}
+
+.tiddler .button {padding:0.2em 0.4em;}
+
+.tagging {margin:0.5em 0.5em 0.5em 0; float:left; display:none;}
+.isTag .tagging {display:block;}
+.tagged {margin:0.5em; float:right;}
+.tagging, .tagged {font-size:0.9em; padding:0.25em;}
+.tagging ul, .tagged ul {list-style:none; margin:0.25em; padding:0;}
+.tagClear {clear:both;}
+
+.footer {font-size:.9em;}
+.footer li {display:inline;}
+
+.annotation {padding:0.5em; margin:0.5em;}
+
+* html .viewer pre {width:99%; padding:0 0 1em 0;}
+.viewer {line-height:1.4em; padding-top:0.5em;}
+.viewer .button {margin:0em 0.25em; padding:0em 0.25em;}
+.viewer blockquote {line-height:1.5em; padding-left:0.8em;margin-left:2.5em;}
+.viewer ul, .viewer ol {margin-left:0.5em; padding-left:1.5em;}
+
+.viewer table, table.twtable {border-collapse:collapse; margin:0.8em 1.0em;}
+.viewer th, .viewer td, .viewer tr,.viewer caption,.twtable th, .twtable td, .twtable tr,.twtable caption {padding:3px;}
+table.listView {font-size:0.85em; margin:0.8em 1.0em;}
+table.listView th, table.listView td, table.listView tr {padding:0px 3px 0px 3px;}
+
+.viewer pre {padding:0.5em; margin-left:0.5em; font-size:1.2em; line-height:1.4em; overflow:auto;}
+.viewer code {font-size:1.2em; line-height:1.4em;}
+
+.editor {font-size:1.1em;}
+.editor input, .editor textarea {display:block; width:100%; font:inherit;}
+.editorFooter {padding:0.25em 0em; font-size:.9em;}
+.editorFooter .button {padding-top:0px; padding-bottom:0px;}
+
+.fieldsetFix {border:0; padding:0; margin:1px 0px 1px 0px;}
+
+.sparkline {line-height:1em;}
+.sparktick {outline:0;}
+
+.zoomer {font-size:1.1em; position:absolute; overflow:hidden;}
+.zoomer div {padding:1em;}
+
+* html #backstage {width:99%;}
+* html #backstageArea {width:99%;}
+#backstageArea {display:none; position:relative; overflow: hidden; z-index:150; padding:0.3em 0.5em 0.3em 0.5em;}
+#backstageToolbar {position:relative;}
+#backstageArea a {font-weight:bold; margin-left:0.5em; padding:0.3em 0.5em 0.3em 0.5em;}
+#backstageButton {display:none; position:absolute; z-index:175; top:0em; right:0em;}
+#backstageButton a {padding:0.1em 0.4em 0.1em 0.4em; margin:0.1em 0.1em 0.1em 0.1em;}
+#backstage {position:relative; width:100%; z-index:50;}
+#backstagePanel {display:none; z-index:100; position:absolute; margin:0em 3em 0em 3em; padding:1em 1em 1em 1em;}
+.backstagePanelFooter {padding-top:0.2em; float:right;}
+.backstagePanelFooter a {padding:0.2em 0.4em 0.2em 0.4em;}
+#backstageCloak {display:none; z-index:20; position:absolute; width:100%; height:100px;}
+
+.whenBackstage {display:none;}
+.backstageVisible .whenBackstage {display:block;}
+/*}}}*/</pre>
+</div>
+<div title="StyleSheetLocale">
+<pre>/***
+StyleSheet for use when a translation requires any css style changes.
+This StyleSheet can be used directly by languages such as Chinese, Japanese and Korean which use a logographic writing system and need larger font sizes.
+***/
+
+/*{{{*/
+body {font-size:0.8em;}
+
+#sidebarOptions {font-size:1.05em;}
+#sidebarOptions a {font-style:normal;}
+#sidebarOptions .sliderPanel {font-size:0.95em;}
+
+.subtitle {font-size:0.8em;}
+
+.viewer table.listView {font-size:0.95em;}
+
+.htmlarea .toolbarHA table {border:1px solid ButtonFace; margin:0em 0em;}
+/*}}}*/</pre>
+</div>
+<div title="StyleSheetPrint">
+<pre>/*{{{*/
+@media print {
+#mainMenu, #sidebar, #messageArea, .toolbar, #backstageButton {display: none ! important;}
+#displayArea {margin: 1em 1em 0em 1em;}
+/* Fixes a feature in Firefox 1.5.0.2 where print preview displays the noscript content */
+noscript {display:none;}
+}
+/*}}}*/</pre>
+</div>
+<div title="PageTemplate">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='header' macro='gradient vert [[ColorPalette::PrimaryLight]] [[ColorPalette::PrimaryMid]]'&gt;
+&lt;div class='headerShadow'&gt;
+&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+&lt;/div&gt;
+&lt;div class='headerForeground'&gt;
+&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;div id='mainMenu' refresh='content' tiddler='MainMenu'&gt;&lt;/div&gt;
+&lt;div id='sidebar'&gt;
+&lt;div id='sidebarOptions' refresh='content' tiddler='SideBarOptions'&gt;&lt;/div&gt;
+&lt;div id='sidebarTabs' refresh='content' force='true' tiddler='SideBarTabs'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;div id='displayArea'&gt;
+&lt;div id='messageArea'&gt;&lt;/div&gt;
+&lt;div id='tiddlerDisplay'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;!--}}}--&gt;</pre>
+</div>
+<div title="ViewTemplate">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='toolbar' macro='toolbar closeTiddler closeOthers +editTiddler &gt; fields syncing permalink references jump'&gt;&lt;/div&gt;
+&lt;div class='title' macro='view title'&gt;&lt;/div&gt;
+&lt;div class='subtitle'&gt;&lt;span macro='view modifier link'&gt;&lt;/span&gt;, &lt;span macro='view modified date'&gt;&lt;/span&gt; (&lt;span macro='message views.wikified.createdPrompt'&gt;&lt;/span&gt; &lt;span macro='view created date'&gt;&lt;/span&gt;)&lt;/div&gt;
+&lt;div class='tagging' macro='tagging'&gt;&lt;/div&gt;
+&lt;div class='tagged' macro='tags'&gt;&lt;/div&gt;
+&lt;div class='viewer' macro='view text wikified'&gt;&lt;/div&gt;
+&lt;div class='tagClear'&gt;&lt;/div&gt;
+&lt;!--}}}--&gt;</pre>
+</div>
+<div title="EditTemplate">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='toolbar' macro='toolbar +saveTiddler -cancelTiddler deleteTiddler'&gt;&lt;/div&gt;
+&lt;div class='title' macro='view title'&gt;&lt;/div&gt;
+&lt;div class='editor' macro='edit title'&gt;&lt;/div&gt;
+&lt;div macro='annotations'&gt;&lt;/div&gt;
+&lt;div class='editor' macro='edit text'&gt;&lt;/div&gt;
+&lt;div class='editor' macro='edit tags'&gt;&lt;/div&gt;&lt;div class='editorFooter'&gt;&lt;span macro='message views.editor.tagPrompt'&gt;&lt;/span&gt;&lt;span macro='tagChooser'&gt;&lt;/span&gt;&lt;/div&gt;
+&lt;!--}}}--&gt;</pre>
+</div>
+<div title="GettingStarted">
+<pre>To get started with this blank TiddlyWiki, you'll need to modify the following tiddlers:
+* SiteTitle &amp; SiteSubtitle: The title and subtitle of the site, as shown above (after saving, they will also appear in the browser title bar)
+* MainMenu: The menu (usually on the left)
+* DefaultTiddlers: Contains the names of the tiddlers that you want to appear when the TiddlyWiki is opened
+You'll also need to enter your username for signing your edits: &lt;&lt;option txtUserName&gt;&gt;</pre>
+</div>
+<div title="OptionsPanel">
+<pre>These InterfaceOptions for customising TiddlyWiki are saved in your browser
+
+Your username for signing your edits. Write it as a WikiWord (eg JoeBloggs)
+
+&lt;&lt;option txtUserName&gt;&gt;
+&lt;&lt;option chkSaveBackups&gt;&gt; SaveBackups
+&lt;&lt;option chkAutoSave&gt;&gt; AutoSave
+&lt;&lt;option chkRegExpSearch&gt;&gt; RegExpSearch
+&lt;&lt;option chkCaseSensitiveSearch&gt;&gt; CaseSensitiveSearch
+&lt;&lt;option chkAnimate&gt;&gt; EnableAnimations
+
+----
+Also see AdvancedOptions</pre>
+</div>
+</div>
+<!--POST-SHADOWAREA-->
+<div id="storeArea">
+<div title="1. The basics of the task macro" modifier="CehTeh" modified="200706100740" created="200604082224" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706100740">
+<pre>A task has a description, an estimate of how long it will take, and a record of how much time you have spent on it so far.  Here's an example, which shows a task estimated at 3 hours, with 1 hour spent on it, and ''2'' hours remaining:
+&lt;&lt;&lt;
+&lt;&lt;task 3 3 1&gt;&gt; Add a double-click handler to the description cell that opens the editor and selects the text
+&lt;&lt;&lt;
+If you hover the mouse over any part of the task -- the bullet, the description, or any of the numeric cells -- a tip will appear explaining it.
+
+Try modifying the time spent.  Suppose you've just spent one more hour and want to record it.  Just click on the second yellow cell, and enter &quot;+1&quot; (sans the quote marks, of course) in the popup window.  Watch the time remaining go down to 1 hour.
+
+In reality, I originally estimated this task at a half-hour, but it ended up taking 3.5 hours.  The macro also tracks your original estimate, if it is different from the current estimate, in a fourth cell like this:
+&lt;&lt;&lt;
+&lt;&lt;task 0.5 2 1&gt;&gt; Add a double-click handler to the description cell that opens the editor and selects the text
+&lt;&lt;&lt;
+You can adjust the current estimate in the same way as you adjusted the time spent.  Click on the current estimate cell (the first yellow cell), and change it to 2.5 hours by typing &quot;2.5&quot; or &quot;+.5&quot;.
+
+You can also adjust the time remaining, which will modify either the estimate (if the time remaining increases) or the time spent (if it decreases).  Click on the time remaining and add an hour by typing &quot;+1&quot;.
+
+When the time remaining goes to zero, the task is considered complete:
+&lt;&lt;&lt;
+&lt;&lt;task 0.5 3.5 3.5&gt;&gt; Add a double-click handler to the description cell that opens the editor and selects the text
+&lt;&lt;&lt;
+If you haven't already done so, try double-clicking the description.  Yes, it really does open up the editor and select just the text of the description.
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="2. More advanced use of the task macro" modifier="LukeBlanshard" modified="200604090319" created="200604082349" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200604090319">
+<pre>A task's description is a single wikified line, so it can contain any formatting that can be specified on one line:
+&lt;&lt;&lt;
+&lt;&lt;task 1&gt;&gt; Beef up the time click handlers to allow entry of ''two'' values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;task 0.5&gt;&gt; Put tasksum on the ViewTemplate.
+&lt;&lt;&lt;
+You can specify just the description of a task, and leave it unestimated.  Click the question mark to enter the estimate:
+&lt;&lt;&lt;
+&lt;&lt;task&gt;&gt; Beef up the time click handlers to allow entry of ''two'' values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;&lt;
+As this task implies, you can enter two values in the popup when you click on any of the time cells.  Separate them with spaces and/or a comma.  Experiment:
+&lt;&lt;&lt;
+&lt;&lt;task 1&gt;&gt; Beef up the time click handlers to allow entry of ''two'' values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;&lt;
+Finally, if you haven't already figured this out, you can double-click on a task's bullet to mark it complete, with the current estimate entered as the time spent.
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="3. The taskadder macro: add tasks easily" modifier="LukeBlanshard" modified="200605020243" created="200604082241" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605020243">
+<pre>If you've been paying attention, you've noticed that I haven't discussed the actual adding of calls to the task macro within your tiddlers -- it's all been about modifying tasks that were already there.  That's because adding tasks via the taskadder macro is much easier and more intuitive than adding them by hand.
+
+And setting up a taskadder is simplicity itself.  Just add {{{&lt;&lt;taskadder&gt;&gt;}}} to your tiddler.  You will see this:
+&lt;&lt;&lt;
+&lt;&lt;taskadder&gt;&gt;
+&lt;&lt;&lt;
+Just type a task description into the first field, and your initial estimate for how long it will take into the second field.  Click the &quot;add task&quot; button, or just hit Enter in either of the fields, to add the new task into the tiddler.  Notice that you can just start typing a new task as soon as you're done entering the first one.
+
+You can have as many taskadders as you like in any tiddler.  The last one you used will capture the keyboard focus when it is redisplayed, meaning you can type a series of tasks without using the mouse.  Try adding some tasks here and in the above adder:
+&lt;&lt;&lt;
+&lt;&lt;taskadder&gt;&gt;
+&lt;&lt;&lt;
+Notice that the one you just used takes focus when this tiddler is redisplayed.
+
+A taskadder by default adds tasks above itself.  You can make it add them below by adding a {{{below}}} argument to the macro call:
+&lt;&lt;&lt;
+&lt;&lt;taskadder below&gt;&gt;
+&lt;&lt;&lt;
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="4. The tasksum macro: summarize tasks" modifier="LukeBlanshard" modified="200605020248" created="200604082241" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605020248">
+<pre>In this tutorial, we've been looking mostly at individual tasks.  In real life, though, you'll typically have a series of them, or even several series of them in the same tiddler.  In these cases you want a summary that tells you -- at a minimum -- how much time you still expect to spend on these tasks.
+
+To get such a summary, just add {{{&lt;&lt;tasksum start&gt;&gt;}}} before the tasks and {{{&lt;&lt;tasksum end&gt;&gt;}}} after them.  Here's an example:
+&lt;&lt;&lt;
+&lt;&lt;tasksum start&gt;&gt;
+&lt;&lt;task 0.25 0.25 0.25&gt;&gt; Add tooltips to the various cells
+&lt;&lt;task 1 0.75 0.75&gt;&gt; Figure out how to add auto-updating click handlers to the time cells
+&lt;&lt;task 2 2 0&gt;&gt; Add simple click handlers to cur, spent, rem: just allow direct setting of values
+&lt;&lt;task 1 3.5 2.5&gt;&gt; Add a double-click handler to the desc cell that opens the editor and selects the text
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to allow entry of two values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to handle leading + or -
+&lt;&lt;task 1 1 0&gt;&gt; Add a double-click handler to the status cell that functions like typing 0 into the rem cell
+&lt;&lt;tasksum end&gt;&gt;
+&lt;&lt;&lt;
+If you'd rather have the summary at the top, just add {{{here}}} to the start call, ie {{{&lt;&lt;tasksum start here&gt;&gt;}}}.
+&lt;&lt;&lt;
+&lt;&lt;tasksum start here&gt;&gt;
+&lt;&lt;task 0.25 0.25 0.25&gt;&gt; Add tooltips to the various cells
+&lt;&lt;task 1 0.75 0.75&gt;&gt; Figure out how to add auto-updating click handlers to the time cells
+&lt;&lt;task 2 2 0&gt;&gt; Add simple click handlers to cur, spent, rem: just allow direct setting of values
+&lt;&lt;tasksum end&gt;&gt;
+&lt;&lt;&lt;
+You can nest these things if you like, just be sure to match starts and ends:
+&lt;&lt;&lt;
+&lt;&lt;tasksum start here&gt;&gt;
+* Time cell manipulation:&lt;&lt;tasksum start&gt;&gt;
+&lt;&lt;task 1 0.75 0.75&gt;&gt; Figure out how to add auto-updating click handlers to the time cells
+&lt;&lt;task 2 2 0&gt;&gt; Add simple click handlers to cur, spent, rem: just allow direct setting of values
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to allow entry of two values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to handle leading + or -
+&lt;&lt;tasksum end &quot;Cell manipulation:&quot;&gt;&gt;
+&lt;&lt;br&gt;&gt;
+* Double-click handling:&lt;&lt;tasksum start&gt;&gt;
+&lt;&lt;task 1 3.5 2.5&gt;&gt; Add a double-click handler to the desc cell that opens the editor and selects the text
+&lt;&lt;task 1 1 0&gt;&gt; Add a double-click handler to the status cell that functions like typing 0 into the rem cell
+&lt;&lt;tasksum end &quot;Double-clicks:&quot;&gt;&gt;
+
+&lt;&lt;tasksum end&gt;&gt;
+&lt;&lt;&lt;
+Finally, the simplest way to use tasksum is to add it to your view template.  See TaskSummaryViewTemplate for an example template.  Note that if no tasks are present between the start and end, nothing is displayed.
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="5. Task macro installation issues" modifier="LukeBlanshard" modified="200605132015" created="200604082243" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605132015">
+<pre>The TaskMacroPlugin can be installed like any other TiddlyWiki plugin, and used without further effort.  However, there are two issues that may affect you.  (To get started with a brand new wiki that does not have these issues, consider downloading the [[empty LabWiki|empty_labwiki.html]].)
+# The task macros don't play nicely with the default TiddlyWiki display of tags.  In the default view template, a tiddler's list of tags is shown in a little box that floats in the upper right corner of the tiddler.  However, this little box may interfere with the tables used by the task macros.  In Firefox, the tables are drawn right over the top of the tag box, rendering both of them illegible.  In Internet Explorer, the tag box forces the tables to be pushed down below the box, which can waste a lot of space.&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;Thus, I recommend changing your view template to eliminate the little box.  If you use Simon Baird's [[TagglyTagging|http://simonbaird.com/mptw/#TagglyTagging]] (as LabWiki does), then my TaskSummaryViewTemplate might be a good alternative.  Simply import it into your wiki and rename it to ViewTemplate.  This template also demonstrates how to incorporate the tasksum macro into every tiddler so any tiddler with tasks has a summary at the top.&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;
+# Most view templates also add a minus sign (&quot;-&quot;) before the &quot;close&quot; command.  TiddlyWiki interprets this to mean that you want the close command to be executed if you hit the Escape key from within the tiddler.&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;However, most tiddlers never have focus, and so never give you the opportunity to try it out.  But if you have a taskadder in your tiddler, then you suddenly enable this feature -- and you probably don't want it.  It means that if you type a nice long task description and then hit Escape, that description will be lost and the tiddler will be closed.  So I recommend that you remove the minus sign from the view template's menu altogether, as I have done in LabWiki's own ViewTemplate.
+
+----
+This ends the tutorial.  To go back to any previous section, click the down-arrow and choose it: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="Admin" modifier="CehTeh" modified="200706110324" created="200706080535" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706110324">
+<pre>PageTemplate
+|&gt;|SiteTitle - SiteSubtitle|
+|&gt;|MainMenu|
+|DefaultTiddlers&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;ViewTemplate&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;EditTemplate|SideBarOptions|
+|~|OptionsPanel|
+|~|SideBarTabs|
+|~|AdvancedOptions|
+|~|&lt;&lt;tiddler Configuration.SideBarTabs&gt;&gt;|
+
+''StyleSheet:'' StyleSheetColors - StyleSheetLayout - StyleSheetPrint
+
+ColorPalette
+
+SiteUrl</pre>
+</div>
+<div title="BetterTimelineMacro" modifier="Saq" modified="200701030924" created="200607280926" tags="lewcidExtension systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200701030924">
+<pre>/***
+|Name|BetterTimelineMacro|
+|Created by|SaqImtiaz|
+|Location|http://tw.lewcid.org/#BetterTimelineMacro|
+|Version|0.5 beta|
+|Requires|~TW2.x|
+!!!Description:
+A replacement for the core timeline macro that offers more features:
+*list tiddlers with only specfic tag
+*exclude tiddlers with a particular tag
+*limit entries to any number of days, for example one week
+*specify a start date for the timeline, only tiddlers after that date will be listed.
+
+!!!Installation:
+Copy the contents of this tiddler to your TW, tag with systemConfig, save and reload your TW.
+Edit the ViewTemplate to add the fullscreen command to the toolbar.
+
+!!!Syntax:
+{{{&lt;&lt;timeline better:true&gt;&gt;}}}
+''the param better:true enables the advanced features, without it you will get the old timeline behaviour.''
+
+additonal params:
+(use only the ones you want)
+{{{&lt;&lt;timeline better:true  onlyTag:Tag1 excludeTag:Tag2 sortBy:modified/created firstDay:YYYYMMDD maxDays:7 maxEntries:30&gt;&gt;}}}
+
+''explanation of syntax:''
+onlyTag: only tiddlers with this tag will be listed. Default is to list all tiddlers.
+excludeTag: tiddlers with this tag will not be listed.
+sortBy: sort tiddlers by date modified or date created. Possible values are modified or created.
+firstDay: useful for starting timeline from a specific date. Example: 20060701 for 1st of July, 2006
+maxDays: limits timeline to include only tiddlers from the specified number of days. If you use a value of 7 for example, only tiddlers from the last 7 days will be listed.
+maxEntries: limit the total number of entries in the timeline.
+
+
+!!!History:
+*28-07-06: ver 0.5 beta, first release
+
+!!!Code
+***/
+//{{{
+// Return the tiddlers as a sorted array
+TiddlyWiki.prototype.getTiddlers = function(field,excludeTag,includeTag)
+{
+          var results = [];
+          this.forEachTiddler(function(title,tiddler)
+          {
+          if(excludeTag == undefined || tiddler.tags.find(excludeTag) == null)
+                        if(includeTag == undefined || tiddler.tags.find(includeTag)!=null)
+                                      results.push(tiddler);
+          });
+          if(field)
+                   results.sort(function (a,b) {if(a[field] == b[field]) return(0); else return (a[field] &lt; b[field]) ? -1 : +1; });
+          return results;
+}
+
+
+
+//this function by Udo
+function getParam(params, name, defaultValue)
+{
+          if (!params)
+          return defaultValue;
+          var p = params[0][name];
+          return p ? p[0] : defaultValue;
+}
+
+window.old_timeline_handler= config.macros.timeline.handler;
+config.macros.timeline.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+          var args = paramString.parseParams(&quot;list&quot;,null,true);
+          var betterMode = getParam(args, &quot;better&quot;, &quot;false&quot;);
+          if (betterMode == 'true')
+          {
+          var sortBy = getParam(args,&quot;sortBy&quot;,&quot;modified&quot;);
+          var excludeTag = getParam(args,&quot;excludeTag&quot;,undefined);
+          var includeTag = getParam(args,&quot;onlyTag&quot;,undefined);
+          var tiddlers = store.getTiddlers(sortBy,excludeTag,includeTag);
+          var firstDayParam = getParam(args,&quot;firstDay&quot;,undefined);
+          var firstDay = (firstDayParam!=undefined)? firstDayParam: &quot;00010101&quot;;
+          var lastDay = &quot;&quot;;
+          var field= sortBy;
+          var maxDaysParam = getParam(args,&quot;maxDays&quot;,undefined);
+          var maxDays = (maxDaysParam!=undefined)? maxDaysParam*24*60*60*1000: (new Date()).getTime() ;
+          var maxEntries = getParam(args,&quot;maxEntries&quot;,undefined);
+          var last = (maxEntries!=undefined) ? tiddlers.length-Math.min(tiddlers.length,parseInt(maxEntries)) : 0;
+          for(var t=tiddlers.length-1; t&gt;=last; t--)
+                  {
+                  var tiddler = tiddlers[t];
+                  var theDay = tiddler[field].convertToLocalYYYYMMDDHHMM().substr(0,8);
+                  if ((theDay&gt;=firstDay)&amp;&amp; (tiddler[field].getTime()&gt; (new Date()).getTime() - maxDays))
+                     {
+                     if(theDay != lastDay)
+                               {
+                               var theDateList = document.createElement(&quot;ul&quot;);
+                               place.appendChild(theDateList);
+                               createTiddlyElement(theDateList,&quot;li&quot;,null,&quot;listTitle&quot;,tiddler[field].formatString(this.dateFormat));
+                               lastDay = theDay;
+                               }
+                  var theDateListItem = createTiddlyElement(theDateList,&quot;li&quot;,null,&quot;listLink&quot;,null);
+                  theDateListItem.appendChild(createTiddlyLink(place,tiddler.title,true));
+                  }
+                  }
+          }
+
+          else
+              {
+              window.old_timeline_handler.apply(this,arguments);
+              }
+}
+//}}}</pre>
+</div>
+<div title="BuildDependencies" modifier="CehTeh" modified="200804011825" created="200803261326" changecount="3">
+<pre>! Programming Languages
+ * C
+  a C99 compatible compiler, some GCC extensions are used, most are optional.
+ * C++
+  C++98 with some boost and tr1 additions
+ * bash
+  some build scripts (test.sh, ..) use bash specific extensions
+
+! Build Tools
+ * scons
+ * autotools
+ * Doxygen
+ * test.sh (included)
+
+! Extra tools
+ * git
+ * bouml
+
+! Libraries
+ * boost
+ * NoBug
+ * gavl
+</pre>
+</div>
+<div title="ColorPalette" modifier="CehTeh" modified="200803261254" created="200803261252" changecount="5">
+<pre>Background: #fff
+Foreground: #000
+PrimaryPale: #aaf
+PrimaryLight: #88f
+PrimaryMid: #00d
+PrimaryDark: #004
+SecondaryPale: #ffc
+SecondaryLight: #fe8
+SecondaryMid: #db4
+SecondaryDark: #841
+TertiaryPale: #eee
+TertiaryLight: #ccc
+TertiaryMid: #999
+TertiaryDark: #666
+Error: #f88</pre>
+</div>
+<div title="DefaultTiddlers" modifier="CehTeh" modified="200803261335" created="200803261244" changecount="3">
+<pre>Overview</pre>
+</div>
+<div title="FullScreenPlugin" modifier="CehTeh" modified="200706110313" created="200607241016" tags="systemConfig lewcidExtension" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706110313">
+<pre>/***
+|Name|FullScreenPlugin|
+|Created by|SaqImtiaz|
+|Location|http://tw.lewcid.org/#FullScreenPlugin|
+|Version|1.1|
+|Requires|~TW2.x|
+!Description:
+Toggle between viewing tiddlers fullscreen and normally. Very handy for when you need more viewing space.
+
+!Demo:
+Click the ↕ button in the toolbar for this tiddler. Click it again to turn off fullscreen.
+
+!Installation:
+Copy the contents of this tiddler to your TW, tag with systemConfig, save and reload your TW.
+Edit the ViewTemplate to add the fullscreen command to the toolbar.
+
+!History:
+*25-07-06: ver 1.1
+*20-07-06: ver 1.0
+
+!Code
+***/
+//{{{
+var lewcidFullScreen = false;
+
+config.commands.fullscreen =
+{
+            text:&quot; ↕ &quot;,
+            tooltip:&quot;Fullscreen mode&quot;
+};
+
+config.commands.fullscreen.handler = function (event,src,title)
+{
+            if (lewcidFullScreen == false)
+               {
+                lewcidFullScreen = true;
+                setStylesheet('#sidebar, .header, #mainMenu{display:none;} #displayArea{margin:0em 0 0 0 !important;}',&quot;lewcidFullScreenStyle&quot;);
+               }
+            else
+               {
+                lewcidFullScreen = false;
+                setStylesheet(' ',&quot;lewcidFullScreenStyle&quot;);
+               }
+}
+
+config.macros.fullscreen={};
+config.macros.fullscreen.handler =  function(place,macroName,params,wikifier,paramString,tiddler)
+{
+        var label = params[0]||&quot; ↕ &quot;;
+        var tooltip = params[1]||&quot;Fullscreen mode&quot;;
+        createTiddlyButton(place,label,tooltip,config.commands.fullscreen.handler);
+}
+
+var lewcid_fullscreen_closeTiddler = Story.prototype.closeTiddler;
+Story.prototype.closeTiddler =function(title,animate,slowly)
+{
+           lewcid_fullscreen_closeTiddler.apply(this,arguments);
+           if (story.isEmpty() &amp;&amp; lewcidFullScreen == true)
+              config.commands.fullscreen.handler();
+}
+
+
+Slider.prototype.lewcidStop = Slider.prototype.stop;
+Slider.prototype.stop = function()
+{
+           this.lewcidStop();
+           if (story.isEmpty() &amp;&amp; lewcidFullScreen == true)
+              config.commands.fullscreen.handler();
+}
+//}}}</pre>
+</div>
+<div title="Hardware" modifier="CehTeh" created="200803261321" changecount="1">
+<pre>! Platform
+We work and test on PC hardware, 32 and 64 bit. It is intended that Lumiera runs on other platforms which run GNU/Linux.
+
+! Graphics
+There are no special requirements for the graphic system, using of OpenGL will likely be defined by the single plugins. Anyways it will be strictly optional.
+
+! Disks
+Video editing requires decent disk speed, it is suggested to use a fast/big array of disks configured as raid.
+
+! Special Hardware
+There are currently no plans to add support for propietary hardware accelerator boards. We don't have such hardware and we don't want to tie a free software program to closed hardware. This might change if the benefits are worth it, someone dontates such hardware to the developers, the specs of the hardware and the programming API are open.
+</pre>
+</div>
+<div title="InlineJavaScript" modifier="Jeremy" created="200603090618" tags="systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200603090618">
+<pre>/***
+''InlineJavascriptPlugin for ~TiddlyWiki version 1.2.x and 2.0''
+^^author: Eric Shulman - ELS Design Studios
+source: http://www.TiddlyTools.com/#InlineJavascriptPlugin
+license: [[Creative Commons Attribution-ShareAlike 2.5 License|http://creativecommons.org/licenses/by-sa/2.5/]]^^
+
+Insert Javascript executable code directly into your tiddler content. Lets you ''call directly into TW core utility routines, define new functions, calculate values, add dynamically-generated TiddlyWiki-formatted output'' into tiddler content, or perform any other programmatic actions each time the tiddler is rendered.
+!!!!!Usage
+&lt;&lt;&lt;
+When installed, this plugin adds new wiki syntax for surrounding tiddler content with {{{&lt;script&gt;}}} and {{{&lt;/script&gt;}}} markers, so that it can be treated as embedded javascript and executed each time the tiddler is rendered.
+
+''Deferred execution from an 'onClick' link''
+By including a label=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker, the plugin will create a link to an 'onclick' script that will only be executed when that specific link is clicked, rather than running the script each time the tiddler is rendered.
+
+''External script source files:''
+You can also load javascript from an external source URL, by including a src=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker (e.g., {{{&lt;script src=&quot;demo.js&quot;&gt;&lt;/script&gt;}}}). This is particularly useful when incorporating third-party javascript libraries for use in custom extensions and plugins. The 'foreign' javascript code remains isolated in a separate file that can be easily replaced whenever an updated library file becomes available.
+
+''Defining javascript functions and libraries:''
+Although the external javascript file is loaded while the tiddler content is being rendered, any functions it defines will not be available for use until //after// the rendering has been completed. Thus, you cannot load a library and //immediately// use it's functions within the same tiddler. However, once that tiddler has been loaded, the library functions can be freely used in any tiddler (even the one in which it was initially loaded).
+
+To ensure that your javascript functions are always available when needed, you should load the libraries from a tiddler that will be rendered as soon as your TiddlyWiki document is opened. For example, you could put your {{{&lt;script src=&quot;...&quot;&gt;&lt;/script&gt;}}} syntax into a tiddler called LoadScripts, and then add {{{&lt;&lt;tiddler LoadScripts&gt;&gt;}}} in your MainMenu tiddler.
+
+Since the MainMenu is always rendered immediately upon opening your document, the library will always be loaded before any other tiddlers that rely upon the functions it defines. Loading an external javascript library does not produce any direct output in the tiddler, so these definitions should have no impact on the appearance of your MainMenu.
+
+''Creating dynamic tiddler content''
+An important difference between this implementation of embedded scripting and conventional embedded javascript techniques for web pages is the method used to produce output that is dynamically inserted into the document:
+* In a typical web document, you use the document.write() function to output text sequences (often containing HTML tags) that are then rendered when the entire document is first loaded into the browser window.
+* However, in a ~TiddlyWiki document, tiddlers (and other DOM elements) are created, deleted, and rendered &quot;on-the-fly&quot;, so writing directly to the global 'document' object does not produce the results you want (i.e., replacing the embedded script within the tiddler content), and completely replaces the entire ~TiddlyWiki document in your browser window.
+* To allow these scripts to work unmodified, the plugin automatically converts all occurences of document.write() so that the output is inserted into the tiddler content instead of replacing the entire ~TiddlyWiki document.
+
+If your script does not use document.write() to create dynamically embedded content within a tiddler, your javascript can, as an alternative, explicitly return a text value that the plugin can then pass through the wikify() rendering engine to insert into the tiddler display. For example, using {{{return &quot;thistext&quot;}}} will produce the same output as {{{document.write(&quot;thistext&quot;)}}}.
+
+//Note: your script code is automatically 'wrapped' inside a function, {{{_out()}}}, so that any return value you provide can be correctly handled by the plugin and inserted into the tiddler. To avoid unpredictable results (and possibly fatal execution errors), this function should never be redefined or called from ''within'' your script code.//
+
+''Accessing the ~TiddlyWiki DOM''
+The plugin provides one pre-defined variable, 'place', that is passed in to your javascript code so that it can have direct access to the containing DOM element into which the tiddler output is currently being rendered.
+
+Access to this DOM element allows you to create scripts that can:
+* vary their actions based upon the specific location in which they are embedded
+* access 'tiddler-relative' information (use findContainingTiddler(place))
+* perform direct DOM manipulations (when returning wikified text is not enough)
+&lt;&lt;&lt;
+!!!!!Examples
+&lt;&lt;&lt;
+an &quot;alert&quot; message box:
+{{{
+&lt;script&gt;alert('InlineJavascriptPlugin: this is a demonstration message');&lt;/script&gt;
+}}}
+&lt;script&gt;alert('InlineJavascriptPlugin: this is a demonstration message');&lt;/script&gt;
+
+dynamic output:
+{{{
+&lt;script&gt;return (new Date()).toString();&lt;/script&gt;
+}}}
+&lt;script&gt;return (new Date()).toString();&lt;/script&gt;
+
+wikified dynamic output:
+{{{
+&lt;script&gt;return &quot;link to current user: [[&quot;+config.options.txtUserName+&quot;]]&quot;;&lt;/script&gt;
+}}}
+&lt;script&gt;return &quot;link to current user: [[&quot;+config.options.txtUserName+&quot;]]&quot;;&lt;/script&gt;
+
+dynamic output using 'place' to get size information for current tiddler
+{{{
+&lt;script&gt;
+ if (!window.story) window.story=window;
+ var title=story.findContainingTiddler(place).id.substr(7);
+ return title+&quot; is using &quot;+store.getTiddlerText(title).length+&quot; bytes&quot;;
+&lt;/script&gt;
+}}}
+&lt;script&gt;
+ if (!window.story) window.story=window;
+ var title=story.findContainingTiddler(place).id.substr(7);
+ return title+&quot; is using &quot;+store.getTiddlerText(title).length+&quot; bytes&quot;;
+&lt;/script&gt;
+
+creating an 'onclick' button/link that runs a script
+{{{
+&lt;script label=&quot;click here&quot;&gt;
+ if (!window.story) window.story=window;
+ alert(&quot;Hello World!\nlinktext='&quot;+place.firstChild.data+&quot;'\ntiddler='&quot;+story.findContainingTiddler(place).id.substr(7)+&quot;'&quot;);
+&lt;/script&gt;
+}}}
+&lt;script label=&quot;click here&quot;&gt;
+ if (!window.story) window.story=window;
+ alert(&quot;Hello World!\nlinktext='&quot;+place.firstChild.data+&quot;'\ntiddler='&quot;+story.findContainingTiddler(place).id.substr(7)+&quot;'&quot;);
+&lt;/script&gt;
+
+loading a script from a source url
+{{{
+&lt;script src=&quot;demo.js&quot;&gt;return &quot;loading demo.js...&quot;&lt;/script&gt;
+&lt;script label=&quot;click to execute demo() function&quot;&gt;demo()&lt;/script&gt;
+}}}
+where http://www.TiddlyTools.com/demo.js contains:
+&gt;function demo() { alert('this output is from demo(), defined in demo.js') }
+&gt;alert('InlineJavascriptPlugin: demo.js has been loaded');
+&lt;script src=&quot;demo.js&quot;&gt;return &quot;loading demo.js...&quot;&lt;/script&gt;
+&lt;script label=&quot;click to execute demo() function&quot;&gt;demo()&lt;/script&gt;
+&lt;&lt;&lt;
+!!!!!Installation
+&lt;&lt;&lt;
+import (or copy/paste) the following tiddlers into your document:
+''InlineJavascriptPlugin'' (tagged with &lt;&lt;tag systemConfig&gt;&gt;)
+&lt;&lt;&lt;
+!!!!!Revision History
+&lt;&lt;&lt;
+''2006.01.05 [1.4.0]''
+added support 'onclick' scripts. When label=&quot;...&quot; param is present, a button/link is created using the indicated label text, and the script is only executed when the button/link is clicked. 'place' value is set to match the clicked button/link element.
+''2005.12.13 [1.3.1]''
+when catching eval error in IE, e.description contains the error text, instead of e.toString(). Fixed error reporting so IE shows the correct response text. Based on a suggestion by UdoBorkowski
+''2005.11.09 [1.3.0]''
+for 'inline' scripts (i.e., not scripts loaded with src=&quot;...&quot;), automatically replace calls to 'document.write()' with 'place.innerHTML+=' so script output is directed into tiddler content
+Based on a suggestion by BradleyMeck
+''2005.11.08 [1.2.0]''
+handle loading of javascript from an external URL via src=&quot;...&quot; syntax
+''2005.11.08 [1.1.0]''
+pass 'place' param into scripts to provide direct DOM access 
+''2005.11.08 [1.0.0]''
+initial release
+&lt;&lt;&lt;
+!!!!!Credits
+&lt;&lt;&lt;
+This feature was developed by EricShulman from [[ELS Design Studios|http:/www.elsdesign.com]]
+&lt;&lt;&lt;
+!!!!!Code
+***/
+//{{{
+version.extensions.inlineJavascript= {major: 1, minor: 4, revision: 0, date: new Date(2006,1,5)};
+
+config.formatters.push( {
+ name: &quot;inlineJavascript&quot;,
+ match: &quot;\\&lt;script&quot;,
+ lookahead: &quot;\\&lt;script(?: src=\\\&quot;((?:.|\\n)*?)\\\&quot;)?(?: label=\\\&quot;((?:.|\\n)*?)\\\&quot;)?\\&gt;((?:.|\\n)*?)\\&lt;/script\\&gt;&quot;,
+
+ handler: function(w) {
+ var lookaheadRegExp = new RegExp(this.lookahead,&quot;mg&quot;);
+ lookaheadRegExp.lastIndex = w.matchStart;
+ var lookaheadMatch = lookaheadRegExp.exec(w.source)
+ if(lookaheadMatch &amp;&amp; lookaheadMatch.index == w.matchStart) {
+ if (lookaheadMatch[1]) { // load a script library
+ // make script tag, set src, add to body to execute, then remove for cleanup
+ var script = document.createElement(&quot;script&quot;); script.src = lookaheadMatch[1];
+ document.body.appendChild(script); document.body.removeChild(script);
+ }
+ if (lookaheadMatch[2] &amp;&amp; lookaheadMatch[3]) { // create a link to an 'onclick' script
+ // add a link, define click handler, save code in link (pass 'place'), set link attributes
+ var link=createTiddlyElement(w.output,&quot;a&quot;,null,&quot;tiddlyLinkExisting&quot;,lookaheadMatch[2]);
+ link.onclick=function(){try{return(eval(this.code))}catch(e){alert(e.description?e.description:e.toString())}}
+ link.code=&quot;function _out(place){&quot;+lookaheadMatch[3]+&quot;};_out(this);&quot;
+ link.setAttribute(&quot;href&quot;,&quot;javascript:;&quot;); link.setAttribute(&quot;title&quot;,&quot;&quot;); link.style.cursor=&quot;pointer&quot;;
+ }
+ else if (lookaheadMatch[3]) { // run inline script code
+ var code=&quot;function _out(place){&quot;+lookaheadMatch[3]+&quot;};_out(w.output);&quot;
+ code=code.replace(/document.write\(/gi,'place.innerHTML+=(');
+ try { var out = eval(code); } catch(e) { out = e.description?e.description:e.toString(); }
+ if (out &amp;&amp; out.length) wikify(out,w.output);
+ }
+ w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+ }
+ }
+} )
+//}}}
+</pre>
+</div>
+<div title="InlineJavascriptPlugin" modifier="PauloSoares" modified="200609302108" created="200512130544" tags="plugin excludeLists systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200609302108">
+<pre>/***
+|''Name:''|InlineJavascriptPlugin|
+|''Source:''|http://www.TiddlyTools.com/#InlineJavascriptPlugin|
+|''Author:''|Eric Shulman - ELS Design Studios|
+|''License:''|[[Creative Commons Attribution-ShareAlike 2.5 License|http://creativecommons.org/licenses/by-sa/2.5/]]|
+|''~CoreVersion:''|2.0.10|
+
+Insert Javascript executable code directly into your tiddler content. Lets you ''call directly into TW core utility routines, define new functions, calculate values, add dynamically-generated TiddlyWiki-formatted output'' into tiddler content, or perform any other programmatic actions each time the tiddler is rendered.
+!!!!!Usage
+&lt;&lt;&lt;
+When installed, this plugin adds new wiki syntax for surrounding tiddler content with {{{&lt;script&gt;}}} and {{{&lt;/script&gt;}}} markers, so that it can be treated as embedded javascript and executed each time the tiddler is rendered.
+
+''Deferred execution from an 'onClick' link''
+By including a label=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker, the plugin will create a link to an 'onclick' script that will only be executed when that specific link is clicked, rather than running the script each time the tiddler is rendered.
+
+''External script source files:''
+You can also load javascript from an external source URL, by including a src=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker (e.g., {{{&lt;script src=&quot;demo.js&quot;&gt;&lt;/script&gt;}}}). This is particularly useful when incorporating third-party javascript libraries for use in custom extensions and plugins. The 'foreign' javascript code remains isolated in a separate file that can be easily replaced whenever an updated library file becomes available.
+
+''Display script source in tiddler output''
+By including the keyword parameter &quot;show&quot;, in the initial {{{&lt;script&gt;}}} marker, the plugin will include the script source code in the output that it displays in the tiddler.
+
+''Defining javascript functions and libraries:''
+Although the external javascript file is loaded while the tiddler content is being rendered, any functions it defines will not be available for use until //after// the rendering has been completed. Thus, you cannot load a library and //immediately// use it's functions within the same tiddler. However, once that tiddler has been loaded, the library functions can be freely used in any tiddler (even the one in which it was initially loaded).
+
+To ensure that your javascript functions are always available when needed, you should load the libraries from a tiddler that will be rendered as soon as your TiddlyWiki document is opened. For example, you could put your {{{&lt;script src=&quot;...&quot;&gt;&lt;/script&gt;}}} syntax into a tiddler called LoadScripts, and then add {{{&lt;&lt;tiddler LoadScripts&gt;&gt;}}} in your MainMenu tiddler.
+
+Since the MainMenu is always rendered immediately upon opening your document, the library will always be loaded before any other tiddlers that rely upon the functions it defines. Loading an external javascript library does not produce any direct output in the tiddler, so these definitions should have no impact on the appearance of your MainMenu.
+
+''Creating dynamic tiddler content''
+An important difference between this implementation of embedded scripting and conventional embedded javascript techniques for web pages is the method used to produce output that is dynamically inserted into the document:
+* In a typical web document, you use the document.write() function to output text sequences (often containing HTML tags) that are then rendered when the entire document is first loaded into the browser window.
+* However, in a ~TiddlyWiki document, tiddlers (and other DOM elements) are created, deleted, and rendered &quot;on-the-fly&quot;, so writing directly to the global 'document' object does not produce the results you want (i.e., replacing the embedded script within the tiddler content), and completely replaces the entire ~TiddlyWiki document in your browser window.
+* To allow these scripts to work unmodified, the plugin automatically converts all occurences of document.write() so that the output is inserted into the tiddler content instead of replacing the entire ~TiddlyWiki document.
+
+If your script does not use document.write() to create dynamically embedded content within a tiddler, your javascript can, as an alternative, explicitly return a text value that the plugin can then pass through the wikify() rendering engine to insert into the tiddler display. For example, using {{{return &quot;thistext&quot;}}} will produce the same output as {{{document.write(&quot;thistext&quot;)}}}.
+
+//Note: your script code is automatically 'wrapped' inside a function, {{{_out()}}}, so that any return value you provide can be correctly handled by the plugin and inserted into the tiddler. To avoid unpredictable results (and possibly fatal execution errors), this function should never be redefined or called from ''within'' your script code.//
+
+''Accessing the ~TiddlyWiki DOM''
+The plugin provides one pre-defined variable, 'place', that is passed in to your javascript code so that it can have direct access to the containing DOM element into which the tiddler output is currently being rendered.
+
+Access to this DOM element allows you to create scripts that can:
+* vary their actions based upon the specific location in which they are embedded
+* access 'tiddler-relative' information (use findContainingTiddler(place))
+* perform direct DOM manipulations (when returning wikified text is not enough)
+&lt;&lt;&lt;
+!!!!!Examples
+&lt;&lt;&lt;
+an &quot;alert&quot; message box:
+&gt;&lt;script show&gt;
+ alert('InlineJavascriptPlugin: this is a demonstration message');
+&lt;/script&gt;
+dynamic output:
+&gt;&lt;script show&gt;
+ return (new Date()).toString();
+&lt;/script&gt;
+wikified dynamic output:
+&gt;&lt;script show&gt;
+ return &quot;link to current user: [[&quot;+config.options.txtUserName+&quot;]]&quot;;
+&lt;/script&gt;
+dynamic output using 'place' to get size information for current tiddler:
+&gt;&lt;script show&gt;
+ if (!window.story) window.story=window;
+ var title=story.findContainingTiddler(place).id.substr(7);
+ return title+&quot; is using &quot;+store.getTiddlerText(title).length+&quot; bytes&quot;;
+&lt;/script&gt;
+creating an 'onclick' button/link that runs a script:
+&gt;&lt;script label=&quot;click here&quot; show&gt;
+ if (!window.story) window.story=window;
+ alert(&quot;Hello World!\nlinktext='&quot;+place.firstChild.data+&quot;'\ntiddler='&quot;+story.findContainingTiddler(place).id.substr(7)+&quot;'&quot;);
+&lt;/script&gt;
+loading a script from a source url:
+&gt;http://www.TiddlyTools.com/demo.js contains:
+&gt;&gt;{{{function demo() { alert('this output is from demo(), defined in demo.js') } }}}
+&gt;&gt;{{{alert('InlineJavascriptPlugin: demo.js has been loaded'); }}}
+&gt;&lt;script src=&quot;demo.js&quot; show&gt;
+ return &quot;loading demo.js...&quot;
+&lt;/script&gt;
+&gt;&lt;script label=&quot;click to execute demo() function&quot; show&gt;
+ demo()
+&lt;/script&gt;
+&lt;&lt;&lt;
+!!!!!Installation
+&lt;&lt;&lt;
+import (or copy/paste) the following tiddlers into your document:
+''InlineJavascriptPlugin'' (tagged with &lt;&lt;tag systemConfig&gt;&gt;)
+&lt;&lt;&lt;
+!!!!!Revision History
+&lt;&lt;&lt;
+''2006.06.01 [1.5.1]'' when calling wikify() on script return value, pass hightlightRegExp and tiddler params so macros that rely on these values can render properly
+''2006.04.19 [1.5.0]'' added 'show' parameter to force display of javascript source code in tiddler output
+''2006.01.05 [1.4.0]'' added support 'onclick' scripts. When label=&quot;...&quot; param is present, a button/link is created using the indicated label text, and the script is only executed when the button/link is clicked. 'place' value is set to match the clicked button/link element.
+''2005.12.13 [1.3.1]'' when catching eval error in IE, e.description contains the error text, instead of e.toString(). Fixed error reporting so IE shows the correct response text. Based on a suggestion by UdoBorkowski
+''2005.11.09 [1.3.0]'' for 'inline' scripts (i.e., not scripts loaded with src=&quot;...&quot;), automatically replace calls to 'document.write()' with 'place.innerHTML+=' so script output is directed into tiddler content. Based on a suggestion by BradleyMeck
+''2005.11.08 [1.2.0]'' handle loading of javascript from an external URL via src=&quot;...&quot; syntax
+''2005.11.08 [1.1.0]'' pass 'place' param into scripts to provide direct DOM access 
+''2005.11.08 [1.0.0]'' initial release
+&lt;&lt;&lt;
+!!!!!Credits
+&lt;&lt;&lt;
+This feature was developed by EricShulman from [[ELS Design Studios|http:/www.elsdesign.com]]
+&lt;&lt;&lt;
+!!!!!Code
+***/
+//{{{
+version.extensions.inlineJavascript= {major: 1, minor: 5, revision: 1, date: new Date(2006,6,1)};
+
+config.formatters.push( {
+ name: &quot;inlineJavascript&quot;,
+ match: &quot;\\&lt;script&quot;,
+ lookahead: &quot;\\&lt;script(?: src=\\\&quot;((?:.|\\n)*?)\\\&quot;)?(?: label=\\\&quot;((?:.|\\n)*?)\\\&quot;)?( show)?\\&gt;((?:.|\\n)*?)\\&lt;/script\\&gt;&quot;,
+
+ handler: function(w) {
+ var lookaheadRegExp = new RegExp(this.lookahead,&quot;mg&quot;);
+ lookaheadRegExp.lastIndex = w.matchStart;
+ var lookaheadMatch = lookaheadRegExp.exec(w.source)
+ if(lookaheadMatch &amp;&amp; lookaheadMatch.index == w.matchStart) {
+ if (lookaheadMatch[1]) { // load a script library
+ // make script tag, set src, add to body to execute, then remove for cleanup
+ var script = document.createElement(&quot;script&quot;); script.src = lookaheadMatch[1];
+ document.body.appendChild(script); document.body.removeChild(script);
+ }
+ if (lookaheadMatch[4]) { // there is script code
+ if (lookaheadMatch[3]) // show inline script code in tiddler output
+ wikify(&quot;{{{\n&quot;+lookaheadMatch[0]+&quot;\n}}}\n&quot;,w.output);
+ if (lookaheadMatch[2]) { // create a link to an 'onclick' script
+ // add a link, define click handler, save code in link (pass 'place'), set link attributes
+ var link=createTiddlyElement(w.output,&quot;a&quot;,null,&quot;tiddlyLinkExisting&quot;,lookaheadMatch[2]);
+ link.onclick=function(){try{return(eval(this.code))}catch(e){alert(e.description?e.description:e.toString())}}
+ link.code=&quot;function _out(place){&quot;+lookaheadMatch[4]+&quot;};_out(this);&quot;
+ link.setAttribute(&quot;href&quot;,&quot;javascript:;&quot;); link.setAttribute(&quot;title&quot;,&quot;&quot;); link.style.cursor=&quot;pointer&quot;;
+ }
+ else { // run inline script code
+ var code=&quot;function _out(place){&quot;+lookaheadMatch[4]+&quot;};_out(w.output);&quot;
+ code=code.replace(/document.write\(/gi,'place.innerHTML+=(');
+ try { var out = eval(code); } catch(e) { out = e.description?e.description:e.toString(); }
+ if (out &amp;&amp; out.length) wikify(out,w.output,w.highlightRegExp,w.tiddler);
+ }
+ }
+ w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+ }
+ }
+} )
+//}}}</pre>
+</div>
+<div title="MainMenu" modifier="CehTeh" modified="200803261324" created="200803261246" changecount="8">
+<pre>''[[Lumiera|index.html]]''
+OperatingSystem
+[[Hardware]]
+[[Software]]
+BuildDependencies
+RuntimeDependencies
+StyleGuide
+[[Admin]]
+&lt;&lt;fullscreen&gt;&gt;</pre>
+</div>
+<div title="MarkupPreHead" modifier="CehTeh" created="200706191948">
+<pre>&lt;!--{{{--&gt;
+&lt;link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/&gt;
+&lt;!--}}}--&gt;
+
+&lt;style type=&quot;text/css&quot;&gt;#contentWrapper {display:none;}&lt;/style&gt;&lt;div id=&quot;SplashScreen&quot; style=&quot;border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;&quot;&gt;&lt;b&gt;My TiddlyWiki&lt;/b&gt; is loading&lt;blink&gt; ...&lt;/blink&gt;&lt;br&gt;&lt;br&gt;&lt;span style=&quot;font-size: 14px; color:red;&quot;&gt;Requires Javascript.&lt;/span&gt;&lt;/div&gt;</pre>
+</div>
+<div title="OperatingSystem" modifier="CehTeh" modified="200803261323" created="200803261309" changecount="3">
+<pre>Lumiera is written for GNU/Linux. We try to make the best out of modern system programming techniques to reach the best possible performance. It is suggested to use a 64bit OS. Lumiera shall scale with the provided Hardware, the more RAM and the more/faster CPU's you have the better. Nevertheless lower end 32bit machines are supported too.
+
+Secondary targets will be other free operating systems which offer a decent Posix API. By coincidence it will be possible to port Lumiera to Mac OSX if anyone helps with that.
+
+Windows platforms are not on our target list, if someone wants to do port it, we will merge his efforts but unless that happens we will not care for windows compatibility.
+</pre>
+</div>
+<div title="Overview" modifier="CehTeh" created="200803261334" changecount="1">
+<pre> * OperatingSystem
+ * [[Hardware]]
+ * [[Software]]
+ * BuildDependencies
+ * RuntimeDependencies
+ * StyleGuide
+</pre>
+</div>
+<div title="PageTemplate" modifier="CehTeh" modified="200706110330" created="200701131624" tags="MPTWTheme" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706110330">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='header' macro='gradient vert [[ColorPalette::PrimaryLight]] [[ColorPalette::PrimaryMid]]'&gt;
+	&lt;div class='headerShadow'&gt;
+		&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+		&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+	&lt;/div&gt;
+	&lt;div class='headerForeground'&gt;
+		&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+		&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+	&lt;/div&gt;
+&lt;/div&gt;
+&lt;!-- horizontal MainMenu --&gt;
+&lt;div id='topMenu' refresh='content' tiddler='MainMenu'&gt;&lt;/div&gt;
+&lt;!-- original MainMenu menu --&gt;
+&lt;!-- &lt;div id='mainMenu' refresh='content' tiddler='MainMenu'&gt;&lt;/div&gt; --&gt;
+&lt;div id='sidebar'&gt;
+	&lt;div id='sidebarOptions' refresh='content' tiddler='SideBarOptions'&gt;&lt;/div&gt;
+	&lt;div id='sidebarTabs' refresh='content' force='true' tiddler='SideBarTabs'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;div id='displayArea'&gt;
+	&lt;div id='messageArea'&gt;&lt;/div&gt;
+	&lt;div id='tiddlerDisplay'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;!--}}}--&gt;
+</pre>
+</div>
+<div title="PartTiddlerPlugin" modifier="PauloSoares" modified="200611082325" created="200601251216" tags="excludeLists plugin systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200611082325">
+<pre>/***
+|&lt;html&gt;&lt;a name=&quot;Top&quot;/&gt;&lt;/html&gt;''Name:''|PartTiddlerPlugin|
+|''Version:''|1.0.6 (2006-11-07)|
+|''Source:''|http://tiddlywiki.abego-software.de/#PartTiddlerPlugin|
+|''Author:''|UdoBorkowski (ub [at] abego-software [dot] de)|
+|''Licence:''|[[BSD open source license]]|
+|''TiddlyWiki:''|2.0|
+|''Browser:''|Firefox 1.0.4+; InternetExplorer 6.0|
+!Table of Content&lt;html&gt;&lt;a name=&quot;TOC&quot;/&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Description',null, event)&quot;&gt;Description, Syntax&lt;/a&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Applications',null, event)&quot;&gt;Applications&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('LongTiddler',null, event)&quot;&gt;Refering to Paragraphs of a Longer Tiddler&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Citation',null, event)&quot;&gt;Citation Index&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('TableCells',null, event)&quot;&gt;Creating &quot;multi-line&quot; Table Cells&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Tabs',null, event)&quot;&gt;Creating Tabs&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Sliders',null, event)&quot;&gt;Using Sliders&lt;/a&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Revisions',null, event)&quot;&gt;Revision History&lt;/a&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Code',null, event)&quot;&gt;Code&lt;/a&gt;&lt;/html&gt;
+!Description&lt;html&gt;&lt;a name=&quot;Description&quot;/&gt;&lt;/html&gt;
+With the {{{&lt;part aPartName&gt; ... &lt;/part&gt;}}} feature you can structure your tiddler text into separate (named) parts. 
+Each part can be referenced as a &quot;normal&quot; tiddler, using the &quot;//tiddlerName//''/''//partName//&quot; syntax (e.g. &quot;About/Features&quot;). E.g. you may create links to the parts, use it in {{{&lt;&lt;tiddler...&gt;&gt;}}} or {{{&lt;&lt;tabs...&gt;&gt;}}} macros etc.
+
+''Syntax:'' 
+|&gt;|''&lt;part'' //partName// [''hidden''] ''&gt;'' //any tiddler content// ''&lt;/part&gt;''|
+|//partName//|The name of the part. You may reference a part tiddler with the combined tiddler name &quot;//nameOfContainerTidder//''/''//partName//.|
+|''hidden''|When defined the content of the part is not displayed in the container tiddler. But when the part is explicitly referenced (e.g. in a {{{&lt;&lt;tiddler...&gt;&gt;}}} macro or in a link) the part's content is displayed.|
+|&lt;html&gt;&lt;i&gt;any&amp;nbsp;tiddler&amp;nbsp;content&lt;/i&gt;&lt;/html&gt;|&lt;html&gt;The content of the part.&lt;br&gt;A part can have any content that a &quot;normal&quot; tiddler may have, e.g. you may use all the formattings and macros defined.&lt;/html&gt;|
+|&gt;|~~Syntax formatting: Keywords in ''bold'', optional parts in [...]. 'or' means that exactly one of the two alternatives must exist.~~|
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Applications&lt;html&gt;&lt;a name=&quot;Applications&quot;/&gt;&lt;/html&gt;
+!!Refering to Paragraphs of a Longer Tiddler&lt;html&gt;&lt;a name=&quot;LongTiddler&quot;/&gt;&lt;/html&gt;
+Assume you have written a long description in a tiddler and now you want to refer to the content of a certain paragraph in that tiddler (e.g. some definition.) Just wrap the text with a ''part'' block, give it a nice name, create a &quot;pretty link&quot; (like {{{[[Discussion Groups|Introduction/DiscussionGroups]]}}}) and you are done.
+
+Notice this complements the approach to first writing a lot of small tiddlers and combine these tiddlers to one larger tiddler in a second step (e.g. using the {{{&lt;&lt;tiddler...&gt;&gt;}}} macro). Using the ''part'' feature you can first write a &quot;classic&quot; (longer) text that can be read &quot;from top to bottom&quot; and later &quot;reuse&quot; parts of this text for some more &quot;non-linear&quot; reading.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Citation Index&lt;html&gt;&lt;a name=&quot;Citation&quot;/&gt;&lt;/html&gt;
+Create a tiddler &quot;Citations&quot; that contains your &quot;citations&quot;. 
+Wrap every citation with a part and a proper name. 
+
+''Example''
+{{{
+&lt;part BAX98&gt;Baxter, Ira D. et al: //Clone Detection Using Abstract Syntax Trees.// 
+in //Proc. ICSM//, 1998.&lt;/part&gt;
+
+&lt;part BEL02&gt;Bellon, Stefan: //Vergleich von Techniken zur Erkennung duplizierten Quellcodes.// 
+Thesis, Uni Stuttgart, 2002.&lt;/part&gt;
+
+&lt;part DUC99&gt;Ducasse, Stéfane et al: //A Language Independent Approach for Detecting Duplicated Code.// 
+in //Proc. ICSM//, 1999.&lt;/part&gt;
+}}}
+
+You may now &quot;cite&quot; them just by using a pretty link like {{{[[Citations/BAX98]]}}} or even more pretty, like this {{{[[BAX98|Citations/BAX98]]}}}.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Creating &quot;multi-line&quot; Table Cells&lt;html&gt;&lt;a name=&quot;TableCells&quot;/&gt;&lt;/html&gt;
+You may have noticed that it is hard to create table cells with &quot;multi-line&quot; content. E.g. if you want to create a bullet list inside a table cell you cannot just write the bullet list
+{{{
+* Item 1
+* Item 2
+* Item 3
+}}}
+into a table cell (i.e. between the | ... | bars) because every bullet item must start in a new line but all cells of a table row must be in one line.
+
+Using the ''part'' feature this problem can be solved. Just create a hidden part that contains the cells content and use a {{{&lt;&lt;tiddler &gt;&gt;}}} macro to include its content in the table's cell.
+
+''Example''
+{{{
+|!Subject|!Items|
+|subject1|&lt;&lt;tiddler ./Cell1&gt;&gt;|
+|subject2|&lt;&lt;tiddler ./Cell2&gt;&gt;|
+
+&lt;part Cell1 hidden&gt;
+* Item 1
+* Item 2
+* Item 3
+&lt;/part&gt;
+...
+}}}
+
+Notice that inside the {{{&lt;&lt;tiddler ...&gt;&gt;}}} macro you may refer to the &quot;current tiddler&quot; using the &quot;.&quot;.
+
+BTW: The same approach can be used to create bullet lists with items that contain more than one line.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Creating Tabs&lt;html&gt;&lt;a name=&quot;Tabs&quot;/&gt;&lt;/html&gt;
+The build-in {{{&lt;&lt;tabs ...&gt;&gt;}}} macro requires that you defined an additional tiddler for every tab it displays. When you want to have &quot;nested&quot; tabs you need to define a tiddler for the &quot;main tab&quot; and one for every tab it contains. I.e. the definition of a set of tabs that is visually displayed at one place is distributed across multiple tiddlers.
+
+With the ''part'' feature you can put the complete definition in one tiddler, making it easier to keep an overview and maintain the tab sets.
+
+''Example''
+The standard tabs at the sidebar are defined by the following eight tiddlers:
+* SideBarTabs
+* TabAll
+* TabMore
+* TabMoreMissing
+* TabMoreOrphans
+* TabMoreShadowed
+* TabTags
+* TabTimeline
+
+Instead of these eight tiddlers one could define the following SideBarTabs tiddler that uses the ''part'' feature:
+{{{
+&lt;&lt;tabs txtMainTab 
+ Timeline Timeline SideBarTabs/Timeline 
+ All 'All tiddlers' SideBarTabs/All 
+ Tags 'All tags' SideBarTabs/Tags 
+ More 'More lists' SideBarTabs/More&gt;&gt;
+&lt;part Timeline hidden&gt;&lt;&lt;timeline&gt;&gt;&lt;/part&gt;
+&lt;part All hidden&gt;&lt;&lt;list all&gt;&gt;&lt;/part&gt;
+&lt;part Tags hidden&gt;&lt;&lt;allTags&gt;&gt;&lt;/part&gt;
+&lt;part More hidden&gt;&lt;&lt;tabs txtMoreTab 
+ Missing 'Missing tiddlers' SideBarTabs/Missing 
+ Orphans 'Orphaned tiddlers' SideBarTabs/Orphans 
+ Shadowed 'Shadowed tiddlers' SideBarTabs/Shadowed&gt;&gt;&lt;/part&gt;
+&lt;part Missing hidden&gt;&lt;&lt;list missing&gt;&gt;&lt;/part&gt;
+&lt;part Orphans hidden&gt;&lt;&lt;list orphans&gt;&gt;&lt;/part&gt;
+&lt;part Shadowed hidden&gt;&lt;&lt;list shadowed&gt;&gt;&lt;/part&gt;
+}}}
+
+Notice that you can easily &quot;overwrite&quot; individual parts in separate tiddlers that have the full name of the part.
+
+E.g. if you don't like the classic timeline tab but only want to see the 100 most recent tiddlers you could create a tiddler &quot;~SideBarTabs/Timeline&quot; with the following content:
+{{{
+&lt;&lt;forEachTiddler 
+ sortBy 'tiddler.modified' descending 
+ write '(index &lt; 100) ? &quot;* [[&quot;+tiddler.title+&quot;]]\n&quot;:&quot;&quot;'&gt;&gt;
+}}}
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Using Sliders&lt;html&gt;&lt;a name=&quot;Sliders&quot;/&gt;&lt;/html&gt;
+Very similar to the build-in {{{&lt;&lt;tabs ...&gt;&gt;}}} macro (see above) the {{{&lt;&lt;slider ...&gt;&gt;}}} macro requires that you defined an additional tiddler that holds the content &quot;to be slid&quot;. You can avoid creating this extra tiddler by using the ''part'' feature
+
+''Example''
+In a tiddler &quot;About&quot; we may use the slider to show some details that are documented in the tiddler's &quot;Details&quot; part.
+{{{
+...
+&lt;&lt;slider chkAboutDetails About/Details details &quot;Click here to see more details&quot;&gt;&gt;
+&lt;part Details hidden&gt;
+To give you a better overview ...
+&lt;/part&gt;
+...
+}}}
+
+Notice that putting the content of the slider into the slider's tiddler also has an extra benefit: When you decide you need to edit the content of the slider you can just doubleclick the content, the tiddler opens for editing and you can directly start editing the content (in the part section). In the &quot;old&quot; approach you would doubleclick the tiddler, see that the slider is using tiddler X, have to look for the tiddler X and can finally open it for editing. So using the ''part'' approach results in a much short workflow.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Revision history&lt;html&gt;&lt;a name=&quot;Revisions&quot;/&gt;&lt;/html&gt;
+* v1.0.6 (2006-11-07)
+** Bugfix: cannot edit tiddler when UploadPlugin by Bidix is installed. Thanks to José Luis González Castro for reporting the bug.
+* v1.0.5 (2006-03-02)
+** Bugfix: Example with multi-line table cells does not work in IE6. Thanks to Paulo Soares for reporting the bug.
+* v1.0.4 (2006-02-28)
+** Bugfix: Shadow tiddlers cannot be edited (in TW 2.0.6). Thanks to Torsten Vanek for reporting the bug.
+* v1.0.3 (2006-02-26)
+** Adapt code to newly introduced Tiddler.prototype.isReadOnly() function (in TW 2.0.6). Thanks to Paulo Soares for reporting the problem.
+* v1.0.2 (2006-02-05)
+** Also allow other macros than the &quot;tiddler&quot; macro use the &quot;.&quot; in the part reference (to refer to &quot;this&quot; tiddler)
+* v1.0.1 (2006-01-27)
+** Added Table of Content for plugin documentation. Thanks to RichCarrillo for suggesting.
+** Bugfix: newReminder plugin does not work when PartTiddler is installed. Thanks to PauloSoares for reporting.
+* v1.0.0 (2006-01-25)
+** initial version
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Code&lt;html&gt;&lt;a name=&quot;Code&quot;/&gt;&lt;/html&gt;
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+***/
+//{{{
+//============================================================================
+// PartTiddlerPlugin
+
+// Ensure that the PartTiddler Plugin is only installed once.
+//
+if (!version.extensions.PartTiddlerPlugin) {
+
+
+
+version.extensions.PartTiddlerPlugin = {
+ major: 1, minor: 0, revision: 6,
+ date: new Date(2006, 10, 7), 
+ type: 'plugin',
+ source: &quot;http://tiddlywiki.abego-software.de/#PartTiddlerPlugin&quot;
+};
+
+if (!window.abego) window.abego = {};
+if (version.major &lt; 2) alertAndThrow(&quot;PartTiddlerPlugin requires TiddlyWiki 2.0 or newer.&quot;);
+
+//============================================================================
+// Common Helpers
+
+// Looks for the next newline, starting at the index-th char of text. 
+//
+// If there are only whitespaces between index and the newline 
+// the index behind the newline is returned, 
+// otherwise (or when no newline is found) index is returned.
+//
+var skipEmptyEndOfLine = function(text, index) {
+ var re = /(\n|[^\s])/g;
+ re.lastIndex = index;
+ var result = re.exec(text);
+ return (result &amp;&amp; text.charAt(result.index) == '\n') 
+ ? result.index+1
+ : index;
+}
+
+
+//============================================================================
+// Constants
+
+var partEndOrStartTagRE = /(&lt;\/part&gt;)|(&lt;part(?:\s+)((?:[^&gt;])+)&gt;)/mg;
+var partEndTagREString = &quot;&lt;\\/part&gt;&quot;;
+var partEndTagString = &quot;&lt;/part&gt;&quot;;
+
+//============================================================================
+// Plugin Specific Helpers
+
+// Parse the parameters inside a &lt;part ...&gt; tag and return the result.
+//
+// @return [may be null] {partName: ..., isHidden: ...}
+//
+var parseStartTagParams = function(paramText) {
+ var params = paramText.readMacroParams();
+ if (params.length == 0 || params[0].length == 0) return null;
+ 
+ var name = params[0];
+ var paramsIndex = 1;
+ var hidden = false;
+ if (paramsIndex &lt; params.length) {
+ hidden = params[paramsIndex] == &quot;hidden&quot;;
+ paramsIndex++;
+ }
+ 
+ return {
+ partName: name, 
+ isHidden: hidden
+ };
+}
+
+// Returns the match to the next (end or start) part tag in the text, 
+// starting the search at startIndex.
+// 
+// When no such tag is found null is returned, otherwise a &quot;Match&quot; is returned:
+// [0]: full match
+// [1]: matched &quot;end&quot; tag (or null when no end tag match)
+// [2]: matched &quot;start&quot; tag (or null when no start tag match)
+// [3]: content of start tag (or null if no start tag match)
+//
+var findNextPartEndOrStartTagMatch = function(text, startIndex) {
+ var re = new RegExp(partEndOrStartTagRE);
+ re.lastIndex = startIndex;
+ var match = re.exec(text);
+ return match;
+}
+
+//============================================================================
+// Formatter
+
+// Process the &lt;part ...&gt; ... &lt;/part&gt; starting at (w.source, w.matchStart) for formatting.
+//
+// @return true if a complete part section (including the end tag) could be processed, false otherwise.
+//
+var handlePartSection = function(w) {
+ var tagMatch = findNextPartEndOrStartTagMatch(w.source, w.matchStart);
+ if (!tagMatch) return false;
+ if (tagMatch.index != w.matchStart || !tagMatch[2]) return false;
+
+ // Parse the start tag parameters
+ var arguments = parseStartTagParams(tagMatch[3]);
+ if (!arguments) return false;
+ 
+ // Continue processing
+ var startTagEndIndex = skipEmptyEndOfLine(w.source, tagMatch.index + tagMatch[0].length);
+ var endMatch = findNextPartEndOrStartTagMatch(w.source, startTagEndIndex);
+ if (endMatch &amp;&amp; endMatch[1]) {
+ if (!arguments.isHidden) {
+ w.nextMatch = startTagEndIndex;
+ w.subWikify(w.output,partEndTagREString);
+ }
+ w.nextMatch = skipEmptyEndOfLine(w.source, endMatch.index + endMatch[0].length);
+ 
+ return true;
+ }
+ return false;
+}
+
+config.formatters.push( {
+ name: &quot;part&quot;,
+ match: &quot;&lt;part\\s+[^&gt;]+&gt;&quot;,
+ 
+ handler: function(w) {
+ if (!handlePartSection(w)) {
+ w.outputText(w.output,w.matchStart,w.matchStart+w.matchLength);
+ }
+ }
+} )
+
+//============================================================================
+// Extend &quot;fetchTiddler&quot; functionality to also recognize &quot;part&quot;s of tiddlers 
+// as tiddlers.
+
+var currentParent = null; // used for the &quot;.&quot; parent (e.g. in the &quot;tiddler&quot; macro)
+
+// Return the match to the first &lt;part ...&gt; tag of the text that has the
+// requrest partName.
+//
+// @return [may be null]
+//
+var findPartStartTagByName = function(text, partName) {
+ var i = 0;
+ 
+ while (true) {
+ var tagMatch = findNextPartEndOrStartTagMatch(text, i);
+ if (!tagMatch) return null;
+
+ if (tagMatch[2]) {
+ // Is start tag
+ 
+ // Check the name
+ var arguments = parseStartTagParams(tagMatch[3]);
+ if (arguments &amp;&amp; arguments.partName == partName) {
+ return tagMatch;
+ }
+ }
+ i += tagMatch[0].length;
+ }
+}
+
+// Return the part &quot;partName&quot; of the given parentTiddler as a &quot;readOnly&quot; Tiddler 
+// object, using fullName as the Tiddler's title. 
+//
+// All remaining properties of the new Tiddler (tags etc.) are inherited from 
+// the parentTiddler.
+// 
+// @return [may be null]
+//
+var getPart = function(parentTiddler, partName, fullName) {
+ var text = parentTiddler.text;
+ var startTag = findPartStartTagByName(text, partName);
+ if (!startTag) return null;
+ 
+ var endIndexOfStartTag = skipEmptyEndOfLine(text, startTag.index+startTag[0].length);
+ var indexOfEndTag = text.indexOf(partEndTagString, endIndexOfStartTag);
+
+ if (indexOfEndTag &gt;= 0) {
+ var partTiddlerText = text.substring(endIndexOfStartTag,indexOfEndTag);
+ var partTiddler = new Tiddler();
+ partTiddler.set(
+ fullName,
+ partTiddlerText,
+ parentTiddler.modifier,
+ parentTiddler.modified,
+ parentTiddler.tags,
+ parentTiddler.created);
+ partTiddler.abegoIsPartTiddler = true;
+ return partTiddler;
+ }
+ 
+ return null;
+}
+
+// Hijack the store.fetchTiddler to recognize the &quot;part&quot; addresses.
+//
+
+var oldFetchTiddler = store.fetchTiddler ;
+store.fetchTiddler = function(title) {
+ var result = oldFetchTiddler.apply(this, arguments);
+ if (!result &amp;&amp; title) {
+ var i = title.lastIndexOf('/');
+ if (i &gt; 0) {
+ var parentName = title.substring(0, i);
+ var partName = title.substring(i+1);
+ var parent = (parentName == &quot;.&quot;) 
+ ? currentParent 
+ : oldFetchTiddler.apply(this, [parentName]);
+ if (parent) {
+ return getPart(parent, partName, parent.title+&quot;/&quot;+partName);
+ }
+ }
+ }
+ return result; 
+};
+
+
+// The user must not edit a readOnly/partTiddler
+//
+
+config.commands.editTiddler.oldIsReadOnlyFunction = Tiddler.prototype.isReadOnly;
+
+Tiddler.prototype.isReadOnly = function() {
+ // Tiddler.isReadOnly was introduced with TW 2.0.6.
+ // For older version we explicitly check the global readOnly flag
+ if (config.commands.editTiddler.oldIsReadOnlyFunction) {
+ if (config.commands.editTiddler.oldIsReadOnlyFunction.apply(this, arguments)) return true;
+ } else {
+ if (readOnly) return true;
+ }
+
+ return this.abegoIsPartTiddler;
+}
+
+config.commands.editTiddler.handler = function(event,src,title)
+{
+ var t = store.getTiddler(title);
+ // Edit the tiddler if it either is not a tiddler (but a shadowTiddler)
+ // or the tiddler is not readOnly
+ if(!t || !t.abegoIsPartTiddler)
+ {
+ clearMessage();
+ story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE);
+ story.focusTiddler(title,&quot;text&quot;);
+ return false;
+ }
+}
+
+// To allow the &quot;./partName&quot; syntax in macros we need to hijack 
+// the invokeMacro to define the &quot;currentParent&quot; while it is running.
+// 
+var oldInvokeMacro = window.invokeMacro;
+function myInvokeMacro(place,macro,params,wikifier,tiddler) {
+ var oldCurrentParent = currentParent;
+ if (tiddler) currentParent = tiddler;
+ try {
+ oldInvokeMacro.apply(this, arguments);
+ } finally {
+ currentParent = oldCurrentParent;
+ }
+}
+window.invokeMacro = myInvokeMacro;
+
+// Scroll the anchor anchorName in the viewer of the given tiddler visible.
+// When no tiddler is defined use the tiddler of the target given event is used.
+window.scrollAnchorVisible = function(anchorName, tiddler, evt) {
+ var tiddlerElem = null;
+ if (tiddler) {
+ tiddlerElem = document.getElementById(story.idPrefix + tiddler);
+ }
+ if (!tiddlerElem &amp;&amp; evt) {
+ var target = resolveTarget(evt);
+ tiddlerElem = story.findContainingTiddler(target);
+ }
+ if (!tiddlerElem) return;
+
+ var children = tiddlerElem.getElementsByTagName(&quot;a&quot;);
+ for (var i = 0; i &lt; children.length; i++) {
+ var child = children[i];
+ var name = child.getAttribute(&quot;name&quot;);
+ if (name == anchorName) {
+ var y = findPosY(child);
+ window.scrollTo(0,y);
+ return;
+ }
+ }
+}
+
+} // of &quot;install only once&quot;
+//}}}
+
+/***
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Licence and Copyright
+Copyright (c) abego Software ~GmbH, 2006 ([[www.abego-software.de|http://www.abego-software.de]])
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+Neither the name of abego Software nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+***/</pre>
+</div>
+<div title="RSSReaderPlugin" modifier="BidiX" modified="200704220833" created="200704132044" tags="systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200704220833">
+<pre>/***
+|''Name:''|RSSReaderPlugin|
+|''Description:''|This plugin provides a RSSReader for TiddlyWiki|
+|''Version:''|1.1.1|
+|''Date:''|Apr 21, 2007|
+|''Source:''|http://tiddlywiki.bidix.info/#RSSReaderPlugin|
+|''Documentation:''|http://tiddlywiki.bidix.info/#RSSReaderPluginDoc|
+|''Author:''|BidiX (BidiX (at) bidix (dot) info)|
+|''Credit:''|BramChen for RssNewsMacro|
+|''License:''|[[BSD open source license|http://tiddlywiki.bidix.info/#%5B%5BBSD%20open%20source%20license%5D%5D ]]|
+|''~CoreVersion:''|2.2.0|
+|''OptionalRequires:''|http://www.tiddlytools.com/#NestedSlidersPlugin|
+***/
+//{{{
+version.extensions.RSSReaderPlugin = {
+	major: 1, minor: 1, revision: 1,
+	date: new Date(&quot;Apr 21, 2007&quot;),
+	source: &quot;http://TiddlyWiki.bidix.info/#RSSReaderPlugin&quot;,
+	author: &quot;BidiX&quot;,
+	coreVersion: '2.2.0'
+};
+
+config.macros.rssReader = {
+	dateFormat: &quot;DDD, DD MMM YYYY&quot;,
+	itemStyle: &quot;display: block;border: 1px solid black;padding: 5px;margin: 5px;&quot;, //useed  '@@'+itemStyle+itemText+'@@'
+	msg:{
+		permissionDenied: &quot;Permission to read preferences was denied.&quot;,
+		noRSSFeed: &quot;No RSS Feed at this address %0&quot;,
+		urlNotAccessible: &quot; Access to %0 is not allowed&quot;
+	},
+	cache: [], 	// url =&gt; XMLHttpRequest.responseXML
+	desc: &quot;noDesc&quot;,
+	
+	handler: function(place,macroName,params,wikifier,paramString,tiddler) {
+		var desc = params[0];
+		var feedURL = params[1];
+		var toFilter = (params[2] ? true : false);
+		var filterString = (toFilter?(params[2].substr(0,1) == ' '? tiddler.title:params[2]):'');
+		var place = createTiddlyElement(place, &quot;div&quot;, &quot;RSSReader&quot;);
+		wikify(&quot;^^&lt;&lt;rssFeedUpdate &quot;+feedURL+&quot; [[&quot; + tiddler.title + &quot;]]&gt;&gt;^^\n&quot;,place);
+		if (this.cache[feedURL]) {
+			this.displayRssFeed(this.cache[feedURL], feedURL, place, desc, toFilter, filterString);
+		}
+		else {
+			var r = loadRemoteFile(feedURL,config.macros.rssReader.processResponse, [place, desc, toFilter, filterString]);
+			if (typeof r == &quot;string&quot;)
+				displayMessage(r);
+		}
+		
+	},
+
+	// callback for loadRemoteFile 
+	// params : [place, desc, toFilter, filterString]
+	processResponse: function(status, params, responseText, url, xhr) { // feedURL, place, desc, toFilter, filterString) {	
+		if (window.netscape){
+			try {
+				if (document.location.protocol.indexOf(&quot;http&quot;) == -1) {
+					netscape.security.PrivilegeManager.enablePrivilege(&quot;UniversalBrowserRead&quot;);
+				}
+			}
+			catch (e) { displayMessage(e.description?e.description:e.toString()); }
+		}
+		if (xhr.status == httpStatus.NotFound)
+		 {
+			displayMessage(config.macros.rssReader.noRSSFeed.format([url]));
+			return;
+		}
+		if (!status)
+		 {
+			displayMessage(config.macros.rssReader.noRSSFeed.format([url]));
+			return;
+		}
+		if (xhr.responseXML) {
+			// response is interpreted as XML
+			config.macros.rssReader.cache[url] = xhr.responseXML;
+			config.macros.rssReader.displayRssFeed(xhr.responseXML, params[0], url, params[1], params[2], params[3]);
+		}
+		else {
+			if (responseText.substr(0,5) == &quot;&lt;?xml&quot;) {
+				// response exists but not return as XML -&gt; try to parse it 
+				var dom = (new DOMParser()).parseFromString(responseText, &quot;text/xml&quot;); 
+				if (dom) {
+					// parsing successful so use it
+					config.macros.rssReader.cache[url] = dom;
+					config.macros.rssReader.displayRssFeed(dom, params[0], url, params[1], params[2], params[3]);
+					return;
+				}
+			}
+			// no XML display as html 
+			wikify(&quot;&lt;html&gt;&quot; + responseText + &quot;&lt;/html&gt;&quot;, params[0]);
+			displayMessage(config.macros.rssReader.msg.noRSSFeed.format([url]));
+		}
+	},
+
+	// explore down the DOM tree
+	displayRssFeed: function(xml, place, feedURL, desc, toFilter, filterString){
+		// Channel
+		var chanelNode = xml.getElementsByTagName('channel').item(0);
+		var chanelTitleElement = (chanelNode ? chanelNode.getElementsByTagName('title').item(0) : null);
+		var chanelTitle = &quot;&quot;;
+		if ((chanelTitleElement) &amp;&amp; (chanelTitleElement.firstChild)) 
+			chanelTitle = chanelTitleElement.firstChild.nodeValue;
+		var chanelLinkElement = (chanelNode ? chanelNode.getElementsByTagName('link').item(0) : null);
+		var chanelLink = &quot;&quot;;
+		if (chanelLinkElement) 
+			chanelLink = chanelLinkElement.firstChild.nodeValue;
+		var titleTxt = &quot;!![[&quot;+chanelTitle+&quot;|&quot;+chanelLink+&quot;]]\n&quot;;
+		var title = createTiddlyElement(place,&quot;div&quot;,null,&quot;ChanelTitle&quot;,null);
+		wikify(titleTxt,title);
+		// ItemList
+		var itemList = xml.getElementsByTagName('item');
+		var article = createTiddlyElement(place,&quot;ul&quot;,null,null,null);
+		var lastDate;
+		var re;
+		if (toFilter) 
+			re = new RegExp(filterString.escapeRegExp());
+		for (var i=0; i&lt;itemList.length; i++){
+			var titleElm = itemList[i].getElementsByTagName('title').item(0);
+			var titleText = (titleElm ? titleElm.firstChild.nodeValue : '');
+			if (toFilter &amp;&amp; ! titleText.match(re)) {
+				continue;
+			}
+			var descText = '';
+			descElem = itemList[i].getElementsByTagName('description').item(0);
+			if (descElem){
+				try{
+					for (var ii=0; ii&lt;descElem.childNodes.length; ii++) {
+						descText += descElem.childNodes[ii].nodeValue;
+					}
+				}
+				catch(e){}
+				descText = descText.replace(/&lt;br \/&gt;/g,'\n');
+				if (desc == &quot;asHtml&quot;)
+					descText = &quot;&lt;html&gt;&quot;+descText+&quot;&lt;/html&gt;&quot;;
+			}
+			var linkElm = itemList[i].getElementsByTagName(&quot;link&quot;).item(0);
+			var linkURL = linkElm.firstChild.nodeValue;
+			var pubElm = itemList[i].getElementsByTagName('pubDate').item(0);
+			var pubDate;
+			if (!pubElm) {
+				pubElm = itemList[i].getElementsByTagName('date').item(0); // for del.icio.us
+				if (pubElm) {
+					pubDate = pubElm.firstChild.nodeValue;
+					pubDate = this.formatDateString(this.dateFormat, pubDate);
+					}
+					else {
+						pubDate = '0';
+					}
+				}
+			else {
+				pubDate = (pubElm ? pubElm.firstChild.nodeValue : 0);
+				pubDate = this.formatDate(this.dateFormat, pubDate);
+			}
+			titleText = titleText.replace(/\[|\]/g,'');
+			var rssText = '*'+'[[' + titleText + '|' + linkURL + ']]' + '' ;
+			if ((desc != &quot;noDesc&quot;) &amp;&amp; descText){
+				rssText = rssText.replace(/\n/g,' ');
+				descText = '@@'+this.itemStyle+descText + '@@\n';				
+				if (version.extensions.nestedSliders){
+					descText = '+++[...]' + descText + '===';
+				}
+				rssText = rssText + descText;
+			}
+			var story;
+			if ((lastDate != pubDate) &amp;&amp; ( pubDate != '0')) {
+				story = createTiddlyElement(article,&quot;li&quot;,null,&quot;RSSItem&quot;,pubDate);
+				lastDate = pubDate;
+			}
+			else {
+				lastDate = pubDate;
+			}
+			story = createTiddlyElement(article,&quot;div&quot;,null,&quot;RSSItem&quot;,null);
+			wikify(rssText,story);
+		}
+	},
+	
+	formatDate: function(template, date){
+		var dateString = new Date(date);
+		// template = template.replace(/hh|mm|ss/g,'');
+		return dateString.formatString(template);
+	},
+	
+	formatDateString: function(template, date){
+		var dateString = new Date(date.substr(0,4), date.substr(5,2) - 1, date.substr(8,2)
+			);
+		return dateString.formatString(template);
+	}
+	
+};
+
+config.macros.rssFeedUpdate = {
+	label: &quot;Update&quot;,
+	prompt: &quot;Clear the cache and redisplay this RssFeed&quot;,
+	handler: function(place,macroName,params) {
+		var feedURL = params[0];
+		var tiddlerTitle = params[1];
+		createTiddlyButton(place, this.label, this.prompt, 
+			function () {
+				if (config.macros.rssReader.cache[feedURL]) {
+					config.macros.rssReader.cache[feedURL] = null; 
+			}
+			story.refreshTiddler(tiddlerTitle,null, true);
+		return false;});
+	}
+};
+
+//}}}
+</pre>
+</div>
+<div title="RSSReaderPluginDoc" modifier="BidiX" modified="200704220857" created="200704132051" tags="Doc RSSReader" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200704220857">
+<pre>//last update: RSSReaderPlugin v 1.1.1//
+
+!Description
+This plugin provides a RSSReader for TiddlyWiki
+* It accesses asynchronously an RSSFeed
+*Depending on the chanel item format, each item could be written as :
+**simple text wikified
+**html
+
+!Usage
+{{{
+&lt;&lt;rssReader noDesc|asHtml|asText rssUrl ['filtering string']&gt;&gt;
+	noDesc: only title of item is printed
+
+	asHtml: if you know that description contain html (links, img ...), 
+		the text is enclosed with &lt;html&gt; &lt;/html&gt; tags
+
+ 	asText: if the description should not be interpreted as html the 
+		description is wikified
+
+	rssUrl: the rssFeed url that could be accessed. 
+	
+	'filtering string': if present, the rssfeed item title must contained 
+		this string to be displayed. 
+		If 'filering string' contained space characters only, the tiddler 
+		title is used for filtering.
+
+}}}
+
+For security reasons, if the TiddlyWiki is accessed from http, a ProxyService should be used to access an rssFeed from an other site.
+
+!examples
+| !reader | !RSSFeed type | !working from |
+| BidiXTWRSS | Description asHtml | file: or tiddlywiki.bidix.info |
+| [[Le Monde]] | Description asText | file: or tiddlywiki.bidix.info using proxy |
+| YahooNewsSport | Description asHtml | file: or tiddlywiki.bidix.info using proxy |
+| TiddlyWikiRSS | Description asHtml | file: or tiddlywiki.bidix.info using proxy |
+| [[Libération]] | noDesc | file: or tiddlywiki.bidix.info using proxy |
+| [[TestComment]] | asText and filters | file: or tiddlywiki.bidix.info using proxy |
+see : &lt;&lt;tag RSSFeed&gt;&gt; for the full list.
+
+!Revision history
+* V1.1.0 (2207/04/13)
+**No more import functions
+* V1.0.0 (2006/11/11)
+**refactoring using core loadRemoteFile function
+**import using new tiddlywiki:tiddler element
+**import and presentation preserved without EricShulman's NestedSliderPlugin
+**better display of items 
+* v0.3.0 (24/08/2006)
+** Filter on RSS item title
+** Place to display redefined for asynchronous processing
+* v0.2.2 (22/08/2006)
+**Haloscan feed has no pubDate.
+* v0.2.1 (08/05/2006)
+* v0.2.0 (01/05/2006)
+**Small adapations for del.icio.us feed
+* v0.1.1 (28/04/2006)
+**Bug : Channel without title 
+* v0.1.0 (24/04/2006)
+** initial release
+
+
+</pre>
+</div>
+<div title="SiteSubtitle" modifier="CehTeh" modified="200803261251" created="200803261246" changecount="2">
+<pre>Dependencies and Style</pre>
+</div>
+<div title="SiteTitle" modifier="CehTeh" modified="200803261251" created="200803261248" changecount="2">
+<pre>Compatibility</pre>
+</div>
+<div title="Software" modifier="CehTeh" created="200803261323" changecount="2">
+<pre>Lumiera expects a 'standard' desktop installation running a Xserver.
+</pre>
+</div>
+<div title="SplashScreenPlugin" modifier="Saq" modified="200607202048" created="200607191631" tags="lewcidExtension systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200607202048">
+<pre>/***
+
+''Inspired by [[TiddlyPom|http://www.warwick.ac.uk/~tuspam/tiddlypom.html]]''
+
+|Name|SplashScreenPlugin|
+|Created by|SaqImtiaz|
+|Location|http://tw.lewcid.org/#SplashScreenPlugin|
+|Version|0.21 |
+|Requires|~TW2.08+|
+!Description:
+Provides a simple splash screen that is visible while the TW is loading.
+
+!Installation
+Copy the source text of this tiddler to your TW in a new tiddler, tag it with systemConfig and save and reload. The SplashScreen will now be installed and will be visible the next time you reload your TW.
+
+!Customizing
+Once the SplashScreen has been installed and you have reloaded your TW, the splash screen html will be present in the MarkupPreHead tiddler. You can edit it and customize to your needs.
+
+!History
+* 20-07-06 : version 0.21, modified to hide contentWrapper while SplashScreen is displayed.
+* 26-06-06 : version 0.2, first release
+
+!Code
+***/
+//{{{
+var old_lewcid_splash_restart=restart;
+
+restart = function()
+{   if (document.getElementById(&quot;SplashScreen&quot;))
+        document.getElementById(&quot;SplashScreen&quot;).style.display = &quot;none&quot;;
+      if (document.getElementById(&quot;contentWrapper&quot;))
+        document.getElementById(&quot;contentWrapper&quot;).style.display = &quot;block&quot;;
+    
+    old_lewcid_splash_restart();
+   
+    if (splashScreenInstall)
+       {if(config.options.chkAutoSave)
+			{saveChanges();}
+        displayMessage(&quot;TW SplashScreen has been installed, please save and refresh your TW.&quot;);
+        }
+}
+
+
+var oldText = store.getTiddlerText(&quot;MarkupPreHead&quot;);
+if (oldText.indexOf(&quot;SplashScreen&quot;)==-1)
+   {var siteTitle = store.getTiddlerText(&quot;SiteTitle&quot;);
+   var splasher='\n\n&lt;style type=&quot;text/css&quot;&gt;#contentWrapper {display:none;}&lt;/style&gt;&lt;div id=&quot;SplashScreen&quot; style=&quot;border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;&quot;&gt;&lt;b&gt;'+siteTitle +'&lt;/b&gt; is loading&lt;blink&gt; ...&lt;/blink&gt;&lt;br&gt;&lt;br&gt;&lt;span style=&quot;font-size: 14px; color:red;&quot;&gt;Requires Javascript.&lt;/span&gt;&lt;/div&gt;';
+   if (! store.tiddlerExists(&quot;MarkupPreHead&quot;))
+       {var myTiddler = store.createTiddler(&quot;MarkupPreHead&quot;);}
+   else
+      {var myTiddler = store.getTiddler(&quot;MarkupPreHead&quot;);}
+      myTiddler.set(myTiddler.title,oldText+splasher,config.options.txtUserName,null,null);
+      store.setDirty(true);
+      var splashScreenInstall = true;
+}
+//}}}</pre>
+</div>
+<div title="StyleGuide" modifier="CehTeh" modified="200803261336" created="200803261258" changecount="4">
+<pre>! Source code formatting
+http://www.gnu.org/prep/standards/html_node/Formatting.html#Formatting
+
+! Contibuting
+
+! Tests
+</pre>
+</div>
+<div title="StyleSheet" modifier="CehTeh" modified="200706090017" created="200701131624" tags="MPTWTheme" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706090017">
+<pre>/*{{{*/
+/* a contrasting background so I can see where one tiddler ends and the other begins */
+body {
+	background: [[ColorPalette::TertiaryLight]];
+}
+
+/* sexy colours and font for the header */
+.headerForeground {
+	color: [[ColorPalette::PrimaryPale]];
+}
+.headerShadow, .headerShadow a {
+	color: [[ColorPalette::PrimaryMid]];
+}
+.headerForeground, .headerShadow {
+	padding: 1em 1em 0;
+	font-family: 'Trebuchet MS' sans-serif;
+	font-weight:bold;
+}
+.headerForeground .siteSubtitle {
+	color: [[ColorPalette::PrimaryLight]];
+}
+.headerShadow .siteSubtitle {
+	color: [[ColorPalette::PrimaryMid]];
+}
+
+/* make shadow go and down right instead of up and left */
+.headerShadow {
+	left: 2px;
+	top: 3px;
+}
+
+/* prefer monospace for editing */
+.editor textarea {
+	font-family: 'Consolas' monospace;
+}
+
+/* sexy tiddler titles */
+.title {
+	font-size: 250%;
+	color: [[ColorPalette::PrimaryLight]];
+	font-family: 'Trebuchet MS' sans-serif;
+}
+
+/* more subtle tiddler subtitle */
+.subtitle {
+	padding:0px;
+	margin:0px;
+	padding-left:0.5em;
+	font-size: 90%;
+	color: [[ColorPalette::TertiaryMid]];
+}
+.subtitle .tiddlyLink {
+	color: [[ColorPalette::TertiaryMid]];
+}
+
+/* a little bit of extra whitespace */
+.viewer {
+	padding-bottom:3px;
+}
+
+/* don't want any background color for headings */
+h1,h2,h3,h4,h5,h6 {
+	background: [[ColorPalette::Background]];
+	color: [[ColorPalette::Foreground]];
+}
+
+/* give tiddlers 3d style border and explicit background */
+.tiddler {
+	background: [[ColorPalette::Background]];
+	border-right: 2px [[ColorPalette::TertiaryMid]] solid;
+	border-bottom: 2px [[ColorPalette::TertiaryMid]] solid;
+	margin-bottom: 1em;
+	padding-bottom: 2em;
+}
+
+/* make options slider look nicer */
+#sidebarOptions .sliderPanel {
+	border:solid 1px [[ColorPalette::PrimaryLight]];
+}
+
+
+/* the borders look wrong with the body background */
+#sidebar .button {
+	border-style: none;
+}
+
+/* displays the list of a tiddler's tags horizontally. used in ViewTemplate */
+.tagglyTagged li.listTitle {
+	display:none
+}
+.tagglyTagged li {
+	display: inline; font-size:90%;
+}
+.tagglyTagged ul {
+	margin:0px; padding:0px;
+}
+
+/* this means you can put line breaks in SidebarOptions for readability */
+#sidebarOptions br {
+	display:none;
+}
+/* undo the above in OptionsPanel */
+#sidebarOptions .sliderPanel br {
+	display:inline;
+}
+
+/* horizontal main menu stuff */
+#displayArea {
+	margin: 1em 15.7em 0em 1em; /* use the freed up space */
+}
+#topMenu br {
+	display: none;
+}
+#topMenu {
+	background: [[ColorPalette::PrimaryMid]];
+	color:[[ColorPalette::PrimaryPale]];
+}
+#topMenu {
+	padding:2px;
+}
+#topMenu .button, #topMenu .tiddlyLink, #topMenu a {
+	margin-left: 0.5em;
+	margin-right: 0.5em;
+	padding-left: 3px;
+	padding-right: 3px;
+	color: [[ColorPalette::PrimaryPale]];
+	font-size: 115%;
+}
+#topMenu .button:hover, #topMenu .tiddlyLink:hover {
+	background: [[ColorPalette::PrimaryDark]];
+}
+
+/* make it print a little cleaner */
+@media print {
+	#topMenu {
+		display: none ! important;
+	}
+	/* not sure if we need all the importants */
+	.tiddler {
+		border-style: none ! important;
+		margin:0px ! important;
+		padding:0px ! important;
+		padding-bottom:2em ! important;
+	}
+	.tagglyTagging .button, .tagglyTagging .hidebutton {
+		display: none ! important;
+	}
+	.headerShadow {
+		visibility: hidden ! important;
+	}
+	.tagglyTagged .quickopentag, .tagged .quickopentag {
+		border-style: none ! important;
+	}
+	.quickopentag a.button, .miniTag {
+		display: none ! important;
+	}
+}
+/*}}}*/
+</pre>
+</div>
+<div title="TabTimeline" modifier="CehTeh" created="200706191949" changecount="1">
+<pre>&lt;&lt;timeline better:true maxDays:14 maxEntries:20&gt;&gt;</pre>
+</div>
+<div title="TaskMacroPlugin" modifier="LukeBlanshard" modified="200605131931" created="200510261917" tags="systemConfig TaskMacro" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605131931">
+<pre>/***
+|Name|TaskMacroPlugin|
+|Author|&lt;&lt;extension TaskMacroPlugin author&gt;&gt;|
+|Location|&lt;&lt;extension TaskMacroPlugin source&gt;&gt;|
+|License|&lt;&lt;extension TaskMacroPlugin license&gt;&gt;|
+|Version|&lt;&lt;extension TaskMacroPlugin versionAndDate&gt;&gt;|
+!Description
+A set of macros to help you keep track of time estimates for tasks.
+
+Macros defined:
+* {{{task}}}: Displays a task description and makes it easy to estimate and track the time spent on the task.
+* {{{taskadder}}}: Displays text entry field to simplify the adding of tasks.
+* {{{tasksum}}}: Displays a summary of tasks sandwiched between two calls to this macro.
+* {{{extension}}}: A simple little macro that displays information about a TiddlyWiki plugin, and that will hopefully someday migrate to the TW core in some form.
+Core overrides:
+* {{{wikify}}}: when wikifying a tiddler's complete text, adds refresh information so the tiddler will be refreshed when it changes
+* {{{config.refreshers}}}: have the built-in refreshers return true; also, add a new refresher (&quot;fullContent&quot;) that redisplays a full tiddler whenever it or any nested tiddlers it shows are changed
+* {{{refreshElements}}}: now checks the return value from the refresher and only short-circuits the recursion if the refresher returns true
+!Plugin Information
+***/
+//{{{
+version.extensions.TaskMacroPlugin = {
+	major: 1, minor: 1, revision: 0,
+	date: new Date(2006,5-1,13),
+	author: &quot;LukeBlanshard&quot;,
+	source: &quot;http://labwiki.sourceforge.net/#TaskMacroPlugin&quot;,
+	license: &quot;http://labwiki.sourceforge.net/#CopyrightAndLicense&quot;
+}
+//}}}
+/***
+A little macro for pulling out extension info.  Use like {{{&lt;&lt;extension PluginName datum&gt;&gt;}}}, where {{{PluginName}}} is the name you used for {{{version.extensions}}} and {{{datum}}} is either {{{versionAndDate}}} or a property of the extension description object, such as {{{source}}}.
+***/
+//{{{
+config.macros.extension = {
+	handler: function( place, macroName, params, wikifier, paramString, tiddler ) {
+		var info  = version.extensions[params[0]]
+		var datum = params[1]
+		switch (params[1]) {
+		case 'versionAndDate':
+			createTiddlyElement( place, &quot;span&quot;, null, null,
+				info.major+'.'+info.minor+'.'+info.revision+', '+info.date.formatString('DD MMM YYYY') )
+			break;
+		default:
+			wikify( info[datum], place )
+			break;
+		}
+	}
+}
+//}}}
+/***
+!Core Overrides
+***/
+//{{{
+window.wikify_orig_TaskMacroPlugin = window.wikify
+window.wikify = function(source,output,highlightRegExp,tiddler)
+{
+	if ( tiddler &amp;&amp; tiddler.text === source )
+		addDisplayDependency( output, tiddler.title )
+	wikify_orig_TaskMacroPlugin.apply( this, arguments )
+}
+config.refreshers_orig_TaskMacroPlugin = config.refreshers
+config.refreshers = {
+	link: function() {
+		config.refreshers_orig_TaskMacroPlugin.link.apply( this, arguments )
+		return true
+	},
+	content: function() {
+		config.refreshers_orig_TaskMacroPlugin.content.apply( this, arguments )
+		return true
+	},
+	fullContent: function( e, changeList ) {
+		var tiddlers = e.refreshTiddlers
+		if ( changeList == null || tiddlers == null )
+			return false
+		for ( var i=0; i &lt; tiddlers.length; ++i )
+			if ( changeList.find(tiddlers[i]) != null ) {
+				var title = tiddlers[0]
+				story.refreshTiddler( title, null, true )
+				return true
+			}
+		return false
+	}
+}
+function refreshElements(root,changeList)
+{
+	var nodes = root.childNodes;
+	for(var c=0; c&lt;nodes.length; c++)
+		{
+		var e = nodes[c],type;
+		if(e.getAttribute)
+			type = e.getAttribute(&quot;refresh&quot;);
+		else
+			type = null;
+		var refresher = config.refreshers[type];
+		if ( ! refresher || ! refresher(e, changeList) )
+			{
+			if(e.hasChildNodes())
+				refreshElements(e,changeList);
+			}
+		}
+}
+//}}}
+/***
+!Global Functions
+***/
+//{{{
+// Add the tiddler whose title is given to the list of tiddlers whose
+// changing will cause a refresh of the tiddler containing the given element.
+function addDisplayDependency( element, title ) {
+	while ( element &amp;&amp; element.getAttribute ) {
+		var idAttr = element.getAttribute(&quot;id&quot;), tiddlerAttr = element.getAttribute(&quot;tiddler&quot;)
+		if ( idAttr &amp;&amp; tiddlerAttr &amp;&amp; idAttr == story.idPrefix+tiddlerAttr ) {
+			var list = element.refreshTiddlers
+			if ( list == null ) {
+				list = [tiddlerAttr]
+				element.refreshTiddlers = list
+				element.setAttribute( &quot;refresh&quot;, &quot;fullContent&quot; )
+			}
+			list.pushUnique( title )
+			return
+		}
+		element = element.parentNode
+	}
+}
+
+// Lifted from Story.prototype.focusTiddler: just return the field instead of focusing it.
+Story.prototype.findEditField = function( title, field )
+{
+	var tiddler = document.getElementById(this.idPrefix + title);
+	if(tiddler != null)
+		{
+		var children = tiddler.getElementsByTagName(&quot;*&quot;)
+		var e = null;
+		for (var t=0; t&lt;children.length; t++)
+			{
+			var c = children[t];
+			if(c.tagName.toLowerCase() == &quot;input&quot; || c.tagName.toLowerCase() == &quot;textarea&quot;)
+				{
+				if(!e)
+					e = c;
+				if(c.getAttribute(&quot;edit&quot;) == field)
+					e = c;
+				}
+			}
+		return e
+		}
+}
+
+// Wraps the given event function in another function that handles the
+// event in a standard way.
+function wrapEventHandler( otherHandler ) {
+	return function(e) {
+		if (!e) var e = window.event
+		e.cancelBubble = true
+		if (e.stopPropagation) e.stopPropagation()
+		return otherHandler( e )
+	}
+}
+//}}}
+/***
+!Task Macro
+Usage:
+&gt; {{{&lt;&lt;task orig cur spent&gt;&gt;description}}}
+All of orig, cur, and spent are optional numbers of hours.  The description goes through the end of the line, and is wikified.
+***/
+//{{{
+config.macros.task = {
+	NASCENT:	0, // Task not yet estimated
+	LIVE:		1, // Estimated but with time remaining
+	DONE:		2, // Completed: no time remaining
+	bullets:	[&quot;\u25cb&quot;, // nascent (open circle)
+			 &quot;\u25ba&quot;, // live (right arrow)
+			 &quot;\u25a0&quot;],// done (black square)
+	styles:		[&quot;nascent&quot;, &quot;live&quot;, &quot;done&quot;],
+
+	// Translatable text:
+	lingo: {
+		spentTooBig:	&quot;Spent time %0 can't exceed current estimate %1&quot;,
+		noNegative:	&quot;Times may not be negative numbers&quot;,
+		statusTips:	[&quot;Not yet estimated&quot;, &quot;To do&quot;, &quot;Done&quot;], // Array indexed by state (NASCENT/LIVE/DONE)
+		descClickTip:	&quot; -- Double-click to edit task description&quot;,
+		statusClickTip:	&quot; -- Double-click to mark task complete&quot;,
+		statusDoneTip:	&quot; -- Double-click to adjust the time spent, to revive the task&quot;,
+		origTip:	&quot;Original estimate in hours&quot;,
+		curTip:		&quot;Current estimate in hours&quot;,
+		curTip2:	&quot;Estimate in hours&quot;, // For when orig == cur
+		clickTip:	&quot; -- Click to adjust&quot;,
+		spentTip:	&quot;Hours spent on this task&quot;,
+		remTip:		&quot;Hours remaining&quot;,
+		curPrompt:	&quot;Estimate this task in hours, or adjust the current estimate by starting with + or -.\n\nYou may optionally also set or adjust the time spent by putting a second number after the first.&quot;,
+		spentPrompt:	&quot;Enter the number of hours you've spent on this task, or adjust the current number by starting with + or -.\n\nYou may optionally also set or adjust the time remaining by putting a second number after the first.&quot;,
+		remPrompt:	&quot;Enter the number of hours it will take to finish this task, or adjust the current estimate by starting with + or -.\n\nYou may optionally also set or adjust the time spent by putting a second number after the first.&quot;,
+		numbersOnly:	&quot;Enter numbers only, please&quot;,
+		notCurrent:	&quot;The tiddler has been modified since it was displayed, please redisplay it before doing this.&quot;
+	},
+
+	// The macro handler
+	handler: function( place, macroName, params, wikifier, paramString, tiddler )
+	{
+		var start = wikifier.matchStart, end = wikifier.nextMatch
+
+		var origStr	= params.length &gt; 0? params.shift() : &quot;?&quot;
+		var orig	= +origStr // as a number
+		var cur		= params.length &gt; 1? +params.shift() : orig
+		var spent	= params.length &gt; 0? +params.shift() : 0
+		if ( spent &gt; cur )
+			throw Error( this.lingo.spentTooBig.format([spent, cur]) )
+		if ( orig &lt; 0 || cur &lt; 0 || spent &lt; 0 )
+			throw Error( this.lingo.noNegative )
+		var rem		= cur - spent
+		var state	= isNaN(orig+rem)? this.NASCENT : rem &gt; 0? this.LIVE : this.DONE
+		var table	= createTiddlyElement( place, &quot;table&quot;, null, &quot;task &quot;+this.styles[state] )
+		var tbody	= createTiddlyElement( table, &quot;tbody&quot; )
+		var row		= createTiddlyElement( tbody, &quot;tr&quot; )
+		var statusCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;status&quot;, this.bullets[state] )
+		var descCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;description&quot; )
+
+		var origCell	= state==this.NASCENT || orig==cur? null
+				: createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric original&quot; )
+		var curCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric current&quot; )
+		var spentCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric spent&quot; )
+		var remCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric remaining&quot; )
+
+		var sums = config.macros.tasksum.tasksums
+		if ( sums &amp;&amp; sums.length ) {
+			var summary = [(state == this.NASCENT? NaN : orig), cur, spent]
+			summary.owner = tiddler
+			sums[0].push( summary )
+		}
+
+		// The description goes to the end of the line
+		wikifier.subWikify( descCell, &quot;$\\n?&quot; )
+		var descEnd = wikifier.nextMatch
+
+		statusCell.setAttribute( &quot;title&quot;, this.lingo.statusTips[state] )
+		descCell.setAttribute(   &quot;title&quot;, this.lingo.statusTips[state]+this.lingo.descClickTip )
+		if (origCell) {
+			createTiddlyElement( origCell, &quot;div&quot;, null, null, orig )
+			origCell.setAttribute( &quot;title&quot;, this.lingo.origTip )
+			curCell.setAttribute( &quot;title&quot;, this.lingo.curTip )
+		}
+		else {
+			curCell.setAttribute( &quot;title&quot;, this.lingo.curTip2 )
+		}
+		var curDivContents = (state==this.NASCENT)? &quot;?&quot; : cur
+		var curDiv = createTiddlyElement( curCell, &quot;div&quot;, null, null, curDivContents )
+		spentCell.setAttribute( &quot;title&quot;, this.lingo.spentTip )
+		var spentDiv = createTiddlyElement( spentCell, &quot;div&quot;, null, null, spent )
+		remCell.setAttribute( &quot;title&quot;, this.lingo.remTip )
+		var remDiv = createTiddlyElement( remCell, &quot;div&quot;, null, null, rem )
+
+		// Handle double-click on the description by going
+		// into edit mode and selecting the description
+		descCell.ondblclick = this.editDescription( tiddler, end, descEnd )
+
+		function appTitle( el, suffix ) {
+			el.setAttribute( &quot;title&quot;, el.getAttribute(&quot;title&quot;)+suffix )
+		}
+
+		// For incomplete tasks, handle double-click on the bullet by marking the task complete
+		if ( state != this.DONE ) {
+			appTitle( statusCell, this.lingo.statusClickTip )
+			statusCell.ondblclick = this.markTaskComplete( tiddler, start, end, macroName, orig, cur, state )
+		}
+		// For complete ones, handle double-click on the bullet by letting you adjust the time spent
+		else {
+			appTitle( statusCell, this.lingo.statusDoneTip )
+			statusCell.ondblclick = this.adjustTimeSpent( tiddler, start, end, macroName, orig, cur, spent )
+		}
+
+		// Add click handlers for the numeric cells.
+		if ( state != this.DONE ) {
+			appTitle( curCell, this.lingo.clickTip )
+			curDiv.className = &quot;adjustable&quot;
+			curDiv.onclick = this.adjustCurrentEstimate( tiddler, start, end, macroName,
+				orig, cur, spent, curDivContents )
+		}
+		appTitle( spentCell, this.lingo.clickTip )
+		spentDiv.className = &quot;adjustable&quot;
+		spentDiv.onclick = this.adjustTimeSpent( tiddler, start, end, macroName, orig, cur, spent )
+		if ( state == this.LIVE ) {
+			appTitle( remCell, this.lingo.clickTip )
+			remDiv.className = &quot;adjustable&quot;
+			remDiv.onclick = this.adjustTimeRemaining( tiddler, start, end, macroName, orig, cur, spent )
+		}
+	},
+
+	// Puts the tiddler into edit mode, and selects the range of characters
+	// defined by start and end.  Separated for leak prevention in IE.
+	editDescription: function( tiddler, start, end ) {
+		return wrapEventHandler( function(e) {
+			story.displayTiddler( null, tiddler.title, DEFAULT_EDIT_TEMPLATE )
+			var tiddlerElement = document.getElementById( story.idPrefix + tiddler.title )
+			window.scrollTo( 0, ensureVisible(tiddlerElement) )
+			var element = story.findEditField( tiddler.title, &quot;text&quot; )
+			if ( element &amp;&amp; element.tagName.toLowerCase() == &quot;textarea&quot; ) {
+				// Back up one char if the last char's a newline
+				if ( tiddler.text[end-1] == '\n' )
+					--end
+				element.focus()
+				if ( element.setSelectionRange != undefined ) { // Mozilla
+					element.setSelectionRange( start, end )
+					// Damn mozilla doesn't scroll to visible.  Approximate.
+					var max = 0.0 + element.scrollHeight
+					var len = element.textLength
+					var top = max*start/len, bot = max*end/len
+					element.scrollTop = Math.min( top, (bot+top-element.clientHeight)/2 )
+				}
+				else if ( element.createTextRange != undefined ) { // IE
+					var range = element.createTextRange()
+					range.collapse()
+					range.moveEnd(&quot;character&quot;, end)
+					range.moveStart(&quot;character&quot;, start)
+					range.select()
+				}
+				else // Other? Too bad, just select the whole thing.
+					element.select()
+				return false
+			}
+			else
+				return true
+		} )
+	},
+
+	// Modifies a task macro call such that the task appears complete.
+	markTaskComplete: function( tiddler, start, end, macroName, orig, cur, state ) {
+		var macro = this, text = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			if ( state == macro.NASCENT )
+				orig = cur = 0
+			// The second &quot;cur&quot; in the call below bumps up the time spent
+			// to match the current estimate.
+			macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, cur )
+			return false
+		} )
+	},
+
+	// Asks the user for an adjustment to the current estimate, modifies the macro call accordingly.
+	adjustCurrentEstimate: function( tiddler, start, end, macroName, orig, cur, spent, curDivContents ) {
+		var macro = this, text = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var txt = prompt( macro.lingo.curPrompt, curDivContents )
+			if ( txt != null ) {
+				var a = macro.breakInput( txt )
+				cur = macro.offset( cur, a[0] )
+				if ( a.length &gt; 1 )
+					spent = macro.offset( spent, a[1] )
+				macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, spent )
+			}
+			return false
+		} )
+	},
+
+	// Asks the user for an adjustment to the time spent, modifies the macro call accordingly.
+	adjustTimeSpent: function( tiddler, start, end, macroName, orig, cur, spent ) {
+		var macro = this, text = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var txt = prompt( macro.lingo.spentPrompt, spent )
+			if ( txt != null ) {
+				var a = macro.breakInput( txt )
+				spent = macro.offset( spent, a[0] )
+				var rem = cur - spent
+				if ( a.length &gt; 1 ) {
+					rem = macro.offset( rem, a[1] )
+					cur = spent + rem
+				}
+				macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, spent )
+			}
+			return false
+		} )
+	},
+
+	// Asks the user for an adjustment to the time remaining, modifies the macro call accordingly.
+	adjustTimeRemaining: function( tiddler, start, end, macroName, orig, cur, spent ) {
+		var macro = this
+		var text  = tiddler.text
+		var rem   = cur - spent
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var txt = prompt( macro.lingo.remPrompt, rem )
+			if ( txt != null ) {
+				var a = macro.breakInput( txt )
+				var newRem = macro.offset( rem, a[0] )
+				if ( newRem &gt; rem || a.length &gt; 1 )
+					cur += (newRem - rem)
+				else
+					spent += (rem - newRem)
+				if ( a.length &gt; 1 )
+					spent = macro.offset( spent, a[1] )
+				macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, spent )
+			}
+			return false
+		} )
+	},
+
+	// Breaks input at spaces &amp; commas, returns array
+	breakInput: function( txt ) {
+		var a = txt.trim().split( /[\s,]+/ )
+		if ( a.length == 0 )
+			a = [NaN]
+		return a
+	},
+
+	// Adds to, subtracts from, or replaces a numeric value
+	offset: function( num, txt ) {
+		if ( txt == &quot;&quot; || typeof(txt) != &quot;string&quot; )
+			return NaN
+		if ( txt.match(/^[+-]/) )
+			return num + (+txt)
+		return +txt
+	},
+
+	// Does some error checking, then replaces the indicated macro
+	// call within the text of the given tiddler.
+	replaceMacroCall: function( tiddler, start, end, macroName, orig, cur, spent )
+	{
+		if ( isNaN(cur+spent) ) {
+			alert( this.lingo.numbersOnly )
+			return
+		}
+		if ( spent &lt; 0 || cur &lt; 0 ) {
+			alert( this.lingo.noNegative )
+			return
+		}
+		if ( isNaN(orig) )
+			orig = cur
+		if ( spent &gt; cur )
+			cur = spent
+		var text = tiddler.text.substring(0,start) + &quot;&lt;&lt;&quot; + macroName + &quot; &quot; +
+			orig + &quot; &quot; + cur + &quot; &quot; + spent + &quot;&gt;&gt;&quot; + tiddler.text.substring(end)
+		var title = tiddler.title
+		store.saveTiddler( title, title, text, config.options.txtUserName, new Date(), undefined )
+		//story.refreshTiddler( title, null, true )
+		if ( config.options.chkAutoSave )
+			saveChanges()
+	}
+}
+//}}}
+/***
+!Tasksum Macro
+Usage:
+&gt; {{{&lt;&lt;tasksum &quot;start&quot; [&quot;here&quot; [intro]]&gt;&gt;}}}
+or:
+&gt; {{{&lt;&lt;tasksum &quot;end&quot; [intro]&gt;&gt;}}}
+Put one of the {{{&lt;&lt;tasksum start&gt;&gt;}}} lines before the tasks you want to summarize, and an {{{end}}} line after them.  By default, the summary goes at the end; if you include {{{here}}} in the start line, the summary will go at the top.  The intro argument, if supplied, replaces the default text introducing the summary.
+***/
+//{{{
+config.macros.tasksum = {
+
+	// Translatable text:
+	lingo: {
+		unrecVerb:	&quot;&lt;&lt;%0&gt;&gt; requires 'start' or 'end' as its first argument&quot;,
+		mustMatch:	&quot;&lt;&lt;%0 end&gt;&gt; must match a preceding &lt;&lt;%0 start&gt;&gt;&quot;,
+		defIntro:	&quot;Task summary:&quot;,
+		nascentSum:	&quot;''%0 not estimated''&quot;,
+		doneSum:	&quot;%0 complete (in %1 hours)&quot;,
+		liveSum:	&quot;%0 ongoing (%1 hours so far, ''%2 hours remaining'')&quot;,
+		overSum:	&quot;Total overestimate: %0%.&quot;,
+		underSum:	&quot;Total underestimate: %0%.&quot;,
+		descPattern:	&quot;%0 %1. %2&quot;,
+                origTip:	&quot;Total original estimates in hours&quot;,
+		curTip:		&quot;Total current estimates in hours&quot;,
+		spentTip:	&quot;Total hours spent on tasks&quot;,
+		remTip:		&quot;Total hours remaining&quot;
+	},
+
+	// The macro handler
+	handler: function( place, macroName, params, wikifier, paramString, tiddler )
+	{
+		var sums = this.tasksums
+		if ( params[0] == &quot;start&quot; ) {
+			sums.unshift([])
+			if ( params[1] == &quot;here&quot; ) {
+				sums[0].intro = params[2] || this.lingo.defIntro
+				sums[0].place = place
+				sums[0].placement = place.childNodes.length
+			}
+		}
+		else if ( params[0] == &quot;end&quot; ) {
+			if ( ! sums.length )
+				throw Error( this.lingo.mustMatch.format([macroName]) )
+			var list = sums.shift()
+			var intro = list.intro || params[1] || this.lingo.defIntro
+			var nNascent=0, nLive=0, nDone=0, nMine=0
+			var totLiveSpent=0, totDoneSpent=0
+			var totOrig=0, totCur=0, totSpent=0
+			for ( var i=0; i &lt; list.length; ++i ) {
+				var a = list[i]
+				if ( a.length &gt; 3 ) {
+					nNascent 	+= a[0]
+					nLive 		+= a[1]
+					nDone 		+= a[2]
+					totLiveSpent 	+= a[3]
+					totDoneSpent 	+= a[4]
+					totOrig 	+= a[5]
+					totCur 		+= a[6]
+					totSpent 	+= a[7]
+					if ( a.owner == tiddler )
+						nMine	+= a[8]
+				}
+				else {
+					if ( a.owner == tiddler )
+						++nMine
+					if ( isNaN(a[0]) ) {
+						++nNascent
+					}
+					else {
+						if ( a[1] &gt; a[2] ) {
+							++nLive
+							totLiveSpent += a[2]
+						}
+						else {
+							++nDone
+							totDoneSpent += a[2]
+						}
+						totOrig  += a[0]
+						totCur   += a[1]
+						totSpent += a[2]
+					}
+				}
+			}
+
+			// If we're nested, push a summary outward
+                        if ( sums.length ) {
+				var summary = [nNascent, nLive, nDone, totLiveSpent, totDoneSpent,
+						totOrig, totCur, totSpent, nMine]
+				summary.owner = tiddler
+				sums[0].push( summary )
+			}
+
+			var descs = [], styles = []
+			if ( nNascent &gt; 0 ) {
+				descs.push( this.lingo.nascentSum.format([nNascent]) )
+				styles.push( &quot;nascent&quot; )
+			}
+			if ( nDone &gt; 0 )
+				descs.push( this.lingo.doneSum.format([nDone, totDoneSpent]) )
+			if ( nLive &gt; 0 ) {
+				descs.push( this.lingo.liveSum.format([nLive, totLiveSpent, totCur-totSpent]) )
+				styles.push( &quot;live&quot; )
+			}
+			else
+				styles.push( &quot;done&quot; )
+			var off = &quot;&quot;
+			if ( totOrig &gt; totCur )
+				off = this.lingo.overSum.format( [Math.round(100.0*(totOrig-totCur)/totCur)] )
+			else if ( totCur &gt; totOrig )
+				off = this.lingo.underSum.format( [Math.round(100.0*(totCur-totOrig)/totOrig)] )
+
+			var top		= (list.intro != undefined)
+			var table	= createTiddlyElement( null, &quot;table&quot;, null, &quot;tasksum &quot;+(top?&quot;top&quot;:&quot;bottom&quot;) )
+			var tbody	= createTiddlyElement( table, &quot;tbody&quot; )
+			var row		= createTiddlyElement( tbody, &quot;tr&quot;, null, styles.join(&quot; &quot;) )
+			var descCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;description&quot; )
+
+			var description = this.lingo.descPattern.format( [intro, descs.join(&quot;, &quot;), off] )
+			wikify( description, descCell, null, tiddler )
+
+			var origCell	= totOrig == totCur? null
+					: createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric original&quot;, totOrig )
+			var curCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric current&quot;, totCur )
+			var spentCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric spent&quot;, totSpent )
+			var remCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric remaining&quot;, totCur-totSpent )
+
+			if ( origCell )
+				origCell.setAttribute( &quot;title&quot;, this.lingo.origTip )
+			curCell  .setAttribute( &quot;title&quot;, this.lingo.curTip )
+			spentCell.setAttribute( &quot;title&quot;, this.lingo.spentTip )
+			remCell  .setAttribute( &quot;title&quot;, this.lingo.remTip )
+
+			// Discard the table if there are no tasks
+			if ( list.length &gt; 0 ) {
+				var place = top? list.place : place
+				var placement = top? list.placement : place.childNodes.length
+				if ( placement &gt;= place.childNodes.length )
+					place.appendChild( table )
+				else
+					place.insertBefore( table, place.childNodes[placement] )
+			}
+		}
+		else
+			throw Error( this.lingo.unrecVerb.format([macroName]) )
+
+		// If we're wikifying, and are followed by end-of-line, swallow the newline.
+		if ( wikifier &amp;&amp; wikifier.source.charAt(wikifier.nextMatch) == &quot;\n&quot; )
+			++wikifier.nextMatch
+	},
+
+	// This is the stack of pending summaries
+	tasksums: []
+}
+//}}}
+/***
+!Taskadder Macro
+Usage:
+&gt; {{{&lt;&lt;taskadder [&quot;above&quot;|&quot;below&quot;|&quot;focus&quot;|&quot;nofocus&quot;]...&gt;&gt;}}}
+Creates a line with text entry fields for a description and an estimate.  By default, puts focus in the description field and adds tasks above the entry fields.  Use {{{nofocus}}} to not put focus in the description field.  Use {{{below}}} to add tasks below the entry fields.
+***/
+//{{{
+config.macros.taskadder = {
+
+	// Translatable text:
+	lingo: {
+		unrecParam:	&quot;&lt;&lt;%0&gt;&gt; doesn't recognize '%1' as a parameter&quot;,
+		descTip:	&quot;Describe a new task&quot;,
+		curTip:		&quot;Estimate how long in hours the task will take&quot;,
+		buttonText:	&quot;add task&quot;,
+		buttonTip:	&quot;Add a new task with the description and estimate as entered&quot;,
+		notCurrent:	&quot;The tiddler has been modified since it was displayed, please redisplay it before adding a task this way.&quot;,
+
+		eol:		&quot;eol&quot;
+	},
+
+	// The macro handler
+	handler: function( place, macroName, params, wikifier, paramString, tiddler )
+	{
+		var above = true
+		var focus = false
+
+		while ( params.length &gt; 0 ) {
+			var p = params.shift()
+			switch (p) {
+			case &quot;above&quot;: 	above = true;  break
+			case &quot;below&quot;: 	above = false; break
+			case &quot;focus&quot;: 	focus = true;  break
+			case &quot;nofocus&quot;:	focus = false; break
+			default:	throw Error( this.lingo.unrecParam.format([macroName, p]) )
+			}
+		}
+
+		// If we're followed by end-of-line, swallow the newline.
+		if ( wikifier.source.charAt(wikifier.nextMatch) == &quot;\n&quot; )
+			++wikifier.nextMatch
+
+		var where	= above? wikifier.matchStart : wikifier.nextMatch
+
+		var table	= createTiddlyElement( place, &quot;table&quot;, null, &quot;task&quot; )
+		var tbody	= createTiddlyElement( table, &quot;tbody&quot; )
+		var row		= createTiddlyElement( tbody, &quot;tr&quot; )
+		var statusCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;status&quot; )
+		var descCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;description&quot; )
+		var curCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;numeric&quot; )
+		var addCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;addtask&quot; )
+
+		var descId	= this.generateId()
+		var curId	= this.generateId()
+		var descInput	= createTiddlyElement( descCell, &quot;input&quot;, descId )
+		var curInput	= createTiddlyElement( curCell,  &quot;input&quot;, curId  )
+
+		descInput.setAttribute( &quot;type&quot;, &quot;text&quot; )
+		curInput .setAttribute( &quot;type&quot;, &quot;text&quot; )
+		descInput.setAttribute( &quot;size&quot;, &quot;40&quot;)
+		curInput .setAttribute( &quot;size&quot;, &quot;6&quot; )
+		descInput.setAttribute( &quot;autocomplete&quot;, &quot;off&quot; );
+		curInput .setAttribute( &quot;autocomplete&quot;, &quot;off&quot; );
+		descInput.setAttribute( &quot;title&quot;, this.lingo.descTip );
+		curInput .setAttribute( &quot;title&quot;, this.lingo.curTip  );
+
+		var addAction	= this.addTask( tiddler, where, descId, curId, above )
+		var addButton	= createTiddlyButton( addCell, this.lingo.buttonText, this.lingo.buttonTip, addAction )
+
+		descInput.onkeypress = this.handleEnter(addAction)
+		curInput .onkeypress = descInput.onkeypress
+		addButton.onkeypress = this.handleSpace(addAction)
+		if ( focus || tiddler.taskadderLocation == where ) {
+			descInput.focus()
+			descInput.select()
+		}
+	},
+
+	// Returns a function that inserts a new task macro into the tiddler.
+	addTask: function( tiddler, where, descId, curId, above ) {
+		var macro = this, oldText = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( oldText !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var desc	= document.getElementById(descId).value
+			var cur		= document.getElementById(curId) .value
+			var init	= tiddler.text.substring(0,where) + &quot;&lt;&lt;task &quot; + cur + &quot;&gt;&gt; &quot; + desc + &quot;\n&quot;
+			var text	= init + tiddler.text.substring(where)
+			var title	= tiddler.title
+			tiddler.taskadderLocation = (above? init.length : where)
+			try {
+				store.saveTiddler( title, title, text, config.options.txtUserName, new Date(), undefined )
+				//story.refreshTiddler( title, null, true )
+			}
+			finally {
+				delete tiddler.taskadderLocation
+			}
+			if ( config.options.chkAutoSave )
+				saveChanges()
+		} )
+	},
+
+	// Returns an event handler that delegates to two other functions: &quot;matches&quot; to decide
+	// whether to consume the event, and &quot;addTask&quot; to actually perform the work.
+	handleGeneric: function( addTask, matches ) {
+		return function(e) {
+			if (!e) var e = window.event
+			var consume = false
+			if ( matches(e) ) {
+				consume = true
+				addTask( e )
+			}
+			e.cancelBubble = consume;
+			if ( consume &amp;&amp; e.stopPropagation ) e.stopPropagation();
+			return !consume;
+		}
+	},
+
+	// Returns an event handler that handles enter keys by calling another event handler
+	handleEnter: function( addTask ) {
+		return this.handleGeneric( addTask, function(e){return e.keyCode == 13 || e.keyCode == 10} ) // Different codes for Enter
+	},
+
+	// Returns an event handler that handles the space key by calling another event handler
+	handleSpace: function( addTask ) {
+		return this.handleGeneric( addTask, function(e){return (e.charCode||e.keyCode) == 32} )
+	},
+
+	counter: 0,
+	generateId: function() {
+		return &quot;taskadder:&quot; + String(this.counter++)
+	}
+}
+//}}}
+/***
+!Stylesheet
+***/
+//{{{
+var stylesheet = '\
+.viewer table.task, table.tasksum {\
+	width: 100%;\
+	padding: 0;\
+	border-collapse: collapse;\
+}\
+.viewer table.task {\
+	border: none;\
+	margin: 0;\
+}\
+table.tasksum, .viewer table.tasksum {\
+	border: solid 2px #999;\
+	margin: 3px 0;\
+}\
+table.tasksum td {\
+	text-align: center;\
+	border: 1px solid #ddd;\
+	background-color: #ffc;\
+	vertical-align: middle;\
+	margin: 0;\
+	padding: 0;\
+}\
+.viewer table.task tr {\
+	border: none;\
+}\
+.viewer table.task td {\
+	text-align: center;\
+	vertical-align: baseline;\
+	border: 1px solid #fff;\
+	background-color: inherit;\
+	margin: 0;\
+	padding: 0;\
+}\
+td.numeric {\
+	width: 3em;\
+}\
+table.task td.numeric div {\
+	border: 1px solid #ddd;\
+	background-color: #ffc;\
+	margin: 1px 0;\
+	padding: 0;\
+}\
+table.task td.original div {\
+	background-color: #fdd;\
+}\
+table.tasksum td.original {\
+	background-color: #fdd;\
+}\
+table.tasksum td.description {\
+	background-color: #e8e8e8;\
+}\
+table.task td.status {\
+	width: 1.5em;\
+	cursor: default;\
+}\
+table.task td.description, table.tasksum td.description {\
+	width: auto;\
+	text-align: left;\
+	padding: 0 3px;\
+}\
+table.task.done td.status,table.task.done td.description {\
+	color: #ccc;\
+}\
+table.task.done td.current, table.task.done td.remaining {\
+	visibility: hidden;\
+}\
+table.task.done td.spent div, table.tasksum tr.done td.current,\
+table.tasksum tr.done td.spent, table.tasksum tr.done td.remaining {\
+	background-color: #eee;\
+	color: #aaa;\
+}\
+table.task.nascent td.description {\
+	color: #844;\
+}\
+table.task.nascent td.current div, table.tasksum tr.nascent td.numeric.current {\
+	font-weight: bold;\
+	color: #c00;\
+	background-color: #def;\
+}\
+table.task.nascent td.spent, table.task.nascent td.remaining {\
+	visibility: hidden;\
+}\
+td.remaining {\
+	font-weight: bold;\
+}\
+.adjustable {\
+	cursor: pointer; \
+}\
+table.task input {\
+	display: block;\
+	width: 100%;\
+	font: inherit;\
+	margin: 2px 0;\
+	padding: 0;\
+	border: 1px inset #999;\
+}\
+table.task td.numeric input {\
+	background-color: #ffc;\
+	text-align: center;\
+}\
+table.task td.addtask {\
+	width: 6em;\
+	border-left: 2px solid white;\
+	vertical-align: middle;\
+}\
+'
+setStylesheet( stylesheet, &quot;TaskMacroPluginStylesheet&quot; )
+//}}}
+</pre>
+</div>
+<div title="TaskMacroReleaseNotes" modifier="LukeBlanshard" modified="200605102059" created="200605020308" tags="TaskMacro" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605102059">
+<pre>!!Changes in 1.1.0
+* Made the macros work in nested tiddlers (ie when one tiddler includes another using {{{&lt;&lt;tiddler&gt;&gt;}}} or something similar):
+** Task summaries in the outer tiddler include the tasks from the inner one
+** Using the editing shortcuts on the tasks as displayed in the outer tiddler correctly changes the inner tiddler and also redisplays the outer one
+** Added sanity checks to the editing shortcuts so they will refuse to work if the tiddler has been modified behind their backs
+* Made some small usability fixes:
+** The &quot;add task&quot; button now responds to the Space key (hat tip: Daniel Baird)
+** Double-clicking on a completed task's bullet now does the same thing as clicking on the elapsed time: it lets you adjust the time spent, giving you the option of resurrecting the task (hat tip: ~JackF)
+** Reworked the focus handling of the taskadder macro so it works more intuitively, by refocusing on the same adder you just used
+</pre>
+</div>
+<div title="TaskMacroTutorial" modifier="LukeBlanshard" modified="200605102059" created="200604082009" tags="TaskMacro" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605102059">
+<pre>The task macro provided by the TaskMacroPlugin is for planning, estimating, and tracking detailed tasks such as those required for writing software.  It is inspired by [[Joel Spolsky|http://www.joelonsoftware.com/articles/fog0000000245.html]]'s method for scheduling software development, also popularized by [[Voo2do|http://voo2do.com]] and [[XPlanner|http://xplanner.org]].
+
+For changes since the previous version, see the TaskMacroReleaseNotes.
+
+This tutorial leads you through the use of the task macro itself, and supporting macros that summarize lists of tasks and simplify the adding of tasks to a list.  Follow along by clicking the links below.  Or click the little down-arrow next to this tiddler's title, above, and choose &quot;Open all&quot; to have all the tutorial sections displayed at once.
+
+</pre>
+</div>
+<div title="TaskSummaryViewTemplate" modifier="LukeBlanshard" modified="200604091859" created="200604082012" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200604091859">
+<pre>&lt;!---
+Includes portions of [[TagglyTaggingViewTemplate|http://simonbaird.com/mptw/#TagglyTaggingViewTemplate]], v1.2 (16-Jan-2006).
+Also adds a pair of tasksum macros around the tiddler, to summarize any contained tasks at the top.  Removes the &quot;-&quot; in front of closeTiddler, which can easily bite you if you have a focusable element in a tiddler, such as a taskadder entry field.
+Portions written by Luke Blanshard are hereby released into the public domain.
+---&gt;
+&lt;!--{{{--&gt;
+&lt;div class=&quot;toolbar&quot; macro=&quot;toolbar closeTiddler closeOthers +editTiddler permalink references jump newHere&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;tagglyTagged&quot; macro=&quot;tags&quot;&gt;&lt;/div&gt;
+&lt;div&gt;&lt;span class=&quot;title&quot; macro=&quot;view title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;miniTag&quot; macro=&quot;miniTag&quot;&gt;&lt;/span&gt;&lt;/div&gt;
+&lt;div macro=&quot;tasksum start here&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;viewer&quot; macro=&quot;view text wikified&quot;&gt;&lt;/div&gt;
+&lt;div macro=&quot;tasksum end&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;tagglyTagging&quot; macro=&quot;tagglyListWithSort&quot;&gt;&lt;/div&gt;
+&lt;!--}}}--&gt;
+</pre>
+</div>
+<div title="TextAreaPlugin" modifier="Jeremy" created="200601261745" tags="systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200601261745">
+<pre>/***
+''TextAreaPlugin for TiddlyWiki version 2.0''
+^^author: Eric Shulman - ELS Design Studios
+source: http://www.elsdesign.com/tiddlywiki/#TextAreaPlugin
+license: [[Creative Commons Attribution-ShareAlike 2.5 License|http://creativecommons.org/licenses/by-sa/2.5/]]^^
+
+This plugin 'hijacks' the TW core function, ''Story.prototype.focusTiddler()'', so it can add special 'keyDown' handlers to adjust several behaviors associated with the textarea control used in the tiddler editor.  Specifically, it:
+* Adds text search INSIDE of edit fields.^^
+Use ~CTRL-F for &quot;Find&quot; (prompts for search text), and ~CTRL-G for &quot;Find Next&quot; (uses previous search text)^^
+* Enables TAB characters to be entered into field content^^
+(instead of moving to next field)^^
+* Option to set cursor at top of edit field instead of auto-selecting contents^^
+(see configuration section for checkbox)^^
+!!!!!Configuration
+&lt;&lt;&lt;
+&lt;&lt;option chkDisableAutoSelect&gt;&gt; place cursor at start of textarea instead of pre-selecting content
+&lt;&lt;option chkTextAreaExtensions&gt;&gt; add control-f (find), control-g (find again) and allow TABs as input in textarea
+&lt;&lt;&lt;
+!!!!!Installation
+&lt;&lt;&lt;
+Import (or copy/paste) the following tiddlers into your document:
+''TextAreaPlugin'' (tagged with &lt;&lt;tag systemConfig&gt;&gt;)
+&lt;&lt;&lt;
+!!!!!Revision History
+&lt;&lt;&lt;
+''2006.01.22 [1.0.1]''
+only add extra key processing for TEXTAREA elements (not other edit fields).
+added option to enable/disable textarea keydown extensions (default is &quot;standard keys&quot; only)
+''2006.01.22 [1.0.0]''
+Moved from temporary &quot;System Tweaks&quot; tiddler into 'real' TextAreaPlugin tiddler.
+&lt;&lt;&lt;
+!!!!!Code
+***/
+//{{{
+version.extensions.textAreaPlugin= {major: 1, minor: 0, revision: 1, date: new Date(2006,1,23)};
+//}}}
+
+//{{{
+if (!config.options.chkDisableAutoSelect) config.options.chkDisableAutoSelect=false; // default to standard action
+if (!config.options.chkTextAreaExtensions) config.options.chkTextAreaExtensions=false; // default to standard action
+
+// Focus a specified tiddler. Attempts to focus the specified field, otherwise the first edit field it finds
+Story.prototype.focusTiddler = function(title,field)
+{
+	var tiddler = document.getElementById(this.idPrefix + title);
+	if(tiddler != null)
+		{
+		var children = tiddler.getElementsByTagName(&quot;*&quot;)
+		var e = null;
+		for (var t=0; t&lt;children.length; t++)
+			{
+			var c = children[t];
+			if(c.tagName.toLowerCase() == &quot;input&quot; || c.tagName.toLowerCase() == &quot;textarea&quot;)
+				{
+				if(!e)
+					e = c;
+				if(c.getAttribute(&quot;edit&quot;) == field)
+					e = c;
+				}
+			}
+		if(e)
+			{
+			e.focus();
+			e.select(); // select entire contents
+
+			// TWEAK: add TAB and &quot;find&quot; key handlers
+			if (config.options.chkTextAreaExtensions) // add extra key handlers
+				addKeyDownHandlers(e);
+
+			// TWEAK: option to NOT autoselect contents
+			if (config.options.chkDisableAutoSelect) // set cursor to start of field content
+				if (e.setSelectionRange) e.setSelectionRange(0,0); // for FF
+				else if (e.createTextRange) { var r=e.createTextRange(); r.collapse(true); r.select(); } // for IE
+
+			}
+		}
+}
+//}}}
+
+//{{{
+function addKeyDownHandlers(e)
+{
+	// exit if not textarea or element doesn't allow selections
+	if (e.tagName.toLowerCase()!=&quot;textarea&quot; || !e.setSelectionRange) return;
+
+	// utility function: exits keydown handler and prevents browser from processing the keystroke
+	var processed=function(ev) { ev.cancelBubble=true; if (ev.stopPropagation) ev.stopPropagation(); return false; }
+
+	// capture keypress in edit field
+	e.onkeydown = function(ev) { if (!ev) var ev=window.event;
+
+		// process TAB
+		if (!ev.shiftKey &amp;&amp; ev.keyCode==9) { 
+			// replace current selection with a TAB character
+			var start=e.selectionStart; var end=e.selectionEnd;
+			e.value=e.value.substr(0,start)+String.fromCharCode(9)+e.value.substr(end);
+			// update insertion point, scroll it into view
+			e.setSelectionRange(start+1,start+1);
+			var linecount=e.value.split('\n').length;
+			var thisline=e.value.substr(0,e.selectionStart).split('\n').length-1;
+			e.scrollTop=Math.floor((thisline-e.rows/2)*e.scrollHeight/linecount);
+			return processed(ev);
+		}
+
+		// process CTRL-F (find matching text) or CTRL-G (find next match)
+		if (ev.ctrlKey &amp;&amp; (ev.keyCode==70||ev.keyCode==71)) {
+			// if ctrl-f or no previous search, prompt for search text (default to previous text or current selection)... if no search text, exit
+			if (ev.keyCode==70||!e.find||!e.find.length)
+				{ var f=prompt(&quot;find:&quot;,e.find?e.find:e.value.substring(e.selectionStart,e.selectionEnd)); e.focus(); e.find=f?f:e.find; }
+			if (!e.find||!e.find.length) return processed(ev);
+			// do case-insensitive match with 'wraparound'...  if not found, alert and exit 
+			var newstart=e.value.toLowerCase().indexOf(e.find.toLowerCase(),e.selectionStart+1);
+			if (newstart==-1) newstart=e.value.toLowerCase().indexOf(e.find.toLowerCase());
+			if (newstart==-1) { alert(&quot;'&quot;+e.find+&quot;' not found&quot;); e.focus(); return processed(ev); }
+			// set new selection, scroll it into view, and report line position in status bar
+			e.setSelectionRange(newstart,newstart+e.find.length);
+			var linecount=e.value.split('\n').length;
+			var thisline=e.value.substr(0,e.selectionStart).split('\n').length;
+			e.scrollTop=Math.floor((thisline-1-e.rows/2)*e.scrollHeight/linecount);
+			window.status=&quot;line: &quot;+thisline+&quot;/&quot;+linecount;
+			return processed(ev);
+		}
+	}
+}
+//}}}</pre>
+</div>
+</div>
+<!--POST-STOREAREA-->
+<!--POST-BODY-START-->
+<!--POST-BODY-END-->
+<script type="text/javascript">
+//<![CDATA[
+//
+// Please note:
+// 
+// * This code is designed to be readable but for compactness it only includes brief comments. You can see fuller comments
+//   in the project Subversion repository at http://svn.tiddlywiki.org/Trunk/core/
+//
+// * You should never need to modify this source code directly. TiddlyWiki is carefully designed to allow deep customisation
+//   without changing the core code. Please consult the development group at http://groups.google.com/group/TiddlyWikiDev
+// 
+
+//--
+//-- Configuration repository
+//--
+
+// Miscellaneous options
+var config = {
+	numRssItems: 20, // Number of items in the RSS feed
+	animDuration: 400, // Duration of UI animations in milliseconds
+	cascadeFast: 20, // Speed for cascade animations (higher == slower)
+	cascadeSlow: 60, // Speed for EasterEgg cascade animations
+	cascadeDepth: 5 // Depth of cascade animation
+};
+
+// Adaptors
+config.adaptors = {};
+
+// Backstage tasks
+config.tasks = {};
+
+// Annotations
+config.annotations = {};
+
+// Custom fields to be automatically added to new tiddlers
+config.defaultCustomFields = {};
+
+// Messages
+config.messages = {
+	messageClose: {},
+	dates: {},
+	tiddlerPopup: {}
+};
+
+// Options that can be set in the options panel and/or cookies
+config.options = {
+	chkRegExpSearch: false,
+	chkCaseSensitiveSearch: false,
+	chkAnimate: true,
+	chkSaveBackups: true,
+	chkAutoSave: false,
+	chkGenerateAnRssFeed: false,
+	chkSaveEmptyTemplate: false,
+	chkOpenInNewWindow: true,
+	chkToggleLinks: false,
+	chkHttpReadOnly: true,
+	chkForceMinorUpdate: false,
+	chkConfirmDelete: true,
+	chkInsertTabs: false,
+	chkUsePreForStorage: true, // Whether to use <pre> format for storage
+	chkDisplayStartupTime: false,
+	txtBackupFolder: "",
+	txtMainTab: "tabTimeline",
+	txtMoreTab: "moreTabAll",
+	txtMaxEditRows: "30",
+	txtFileSystemCharSet: "UTF-8"
+	};
+config.optionsDesc = {};
+	
+// List of notification functions to be called when certain tiddlers are changed or deleted
+config.notifyTiddlers = [
+	{name: "StyleSheetLayout", notify: refreshStyles},
+	{name: "StyleSheetColors", notify: refreshStyles},
+	{name: "StyleSheet", notify: refreshStyles},
+	{name: "StyleSheetPrint", notify: refreshStyles},
+	{name: "PageTemplate", notify: refreshPageTemplate},
+	{name: "SiteTitle", notify: refreshPageTitle},
+	{name: "SiteSubtitle", notify: refreshPageTitle},
+	{name: "ColorPalette", notify: refreshColorPalette},
+	{name: null, notify: refreshDisplay}
+];
+
+// Default tiddler templates
+var DEFAULT_VIEW_TEMPLATE = 1;
+var DEFAULT_EDIT_TEMPLATE = 2;
+config.tiddlerTemplates = {
+	1: "ViewTemplate",
+	2: "EditTemplate"
+};
+
+// More messages (rather a legacy layout that shouldn't really be like this)
+config.views = {
+	wikified: {
+		tag: {}
+	},
+	editor: {
+		tagChooser: {}
+	}
+};
+
+// Backstage tasks
+config.backstageTasks = ["save","sync","importTask","tweak","plugins"];
+
+// Macros; each has a 'handler' member that is inserted later
+config.macros = {
+	today: {},
+	version: {},
+	search: {sizeTextbox: 15},
+	tiddler: {},
+	tag: {},
+	tags: {},
+	tagging: {},
+	timeline: {},
+	allTags: {},
+	list: {
+		all: {},
+		missing: {},
+		orphans: {},
+		shadowed: {},
+		touched: {}
+	},
+	closeAll: {},
+	permaview: {},
+	saveChanges: {},
+	slider: {},
+	option: {},
+	options: {},
+	newTiddler: {},
+	newJournal: {},
+	sparkline: {},
+	tabs: {},
+	gradient: {},
+	message: {},
+	view: {},
+	edit: {},
+	tagChooser: {},
+	toolbar: {},
+	br: {},
+	plugins: {},
+	refreshDisplay: {},
+	importTiddlers: {},
+	sync: {},
+	annotations: {}
+};
+
+// Commands supported by the toolbar macro
+config.commands = {
+	closeTiddler: {},
+	closeOthers: {},
+	editTiddler: {},
+	saveTiddler: {hideReadOnly: true},
+	cancelTiddler: {},
+	deleteTiddler: {hideReadOnly: true},
+	permalink: {},
+	references: {type: "popup"},
+	jump: {type: "popup"},
+	syncing: {type: "popup"},
+	fields: {type: "popup"}
+};
+
+// Browser detection... In a very few places, there's nothing else for it but to know what browser we're using.
+config.userAgent = navigator.userAgent.toLowerCase();
+config.browser = {
+	isIE: config.userAgent.indexOf("msie") != -1 && config.userAgent.indexOf("opera") == -1,
+	isGecko: config.userAgent.indexOf("gecko") != -1,
+	ieVersion: /MSIE (\d.\d)/i.exec(config.userAgent), // config.browser.ieVersion[1], if it exists, will be the IE version string, eg "6.0"
+	isSafari: config.userAgent.indexOf("applewebkit") != -1,
+	isBadSafari: !((new RegExp("[\u0150\u0170]","g")).test("\u0150")),
+	firefoxDate: /gecko\/(\d{8})/i.exec(config.userAgent), // config.browser.firefoxDate[1], if it exists, will be Firefox release date as "YYYYMMDD"
+	isOpera: config.userAgent.indexOf("opera") != -1,
+	isLinux: config.userAgent.indexOf("linux") != -1,
+	isUnix: config.userAgent.indexOf("x11") != -1,
+	isMac: config.userAgent.indexOf("mac") != -1,
+	isWindows: config.userAgent.indexOf("win") != -1
+};
+
+// Basic regular expressions
+config.textPrimitives = {
+	upperLetter: "[A-Z\u00c0-\u00de\u0150\u0170]",
+	lowerLetter: "[a-z0-9_\\-\u00df-\u00ff\u0151\u0171]",
+	anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]",
+	anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]"
+};
+if(config.browser.isBadSafari) {
+	config.textPrimitives = {
+		upperLetter: "[A-Z\u00c0-\u00de]",
+		lowerLetter: "[a-z0-9_\\-\u00df-\u00ff]",
+		anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff]",
+		anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff]"
+	};
+}
+config.textPrimitives.sliceSeparator = "::";
+config.textPrimitives.urlPattern = "[a-z]{3,8}:[^\\s:'\"][^\\s'\"]*(?:/|\\b)";
+config.textPrimitives.unWikiLink = "~";
+config.textPrimitives.wikiLink = "(?:(?:" + config.textPrimitives.upperLetter + "+" +
+	config.textPrimitives.lowerLetter + "+" +
+	config.textPrimitives.upperLetter +
+	config.textPrimitives.anyLetter + "*)|(?:" +
+	config.textPrimitives.upperLetter + "{2,}" +
+	config.textPrimitives.lowerLetter + "+))";
+
+config.textPrimitives.cssLookahead = "(?:(" + config.textPrimitives.anyLetter + "+)\\(([^\\)\\|\\n]+)(?:\\):))|(?:(" + config.textPrimitives.anyLetter + "+):([^;\\|\\n]+);)";
+config.textPrimitives.cssLookaheadRegExp = new RegExp(config.textPrimitives.cssLookahead,"mg");
+
+config.textPrimitives.brackettedLink = "\\[\\[([^\\]]+)\\]\\]";
+config.textPrimitives.titledBrackettedLink = "\\[\\[([^\\[\\]\\|]+)\\|([^\\[\\]\\|]+)\\]\\]";
+config.textPrimitives.tiddlerForcedLinkRegExp = new RegExp("(?:" + config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" + 
+	config.textPrimitives.urlPattern + ")","mg");
+config.textPrimitives.tiddlerAnyLinkRegExp = new RegExp("("+ config.textPrimitives.wikiLink + ")|(?:" +
+	config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" +
+	config.textPrimitives.urlPattern + ")","mg");
+
+config.glyphs = {
+	browsers: [
+		function() {return config.browser.isIE;},
+		function() {return true}
+	],
+	currBrowser: null,
+	codes: {
+		downTriangle: ["\u25BC","\u25BE"],
+		downArrow: ["\u2193","\u2193"],
+		bentArrowLeft: ["\u2190","\u21A9"],
+		bentArrowRight: ["\u2192","\u21AA"]
+	}
+};
+
+//--
+//-- Shadow tiddlers
+//--
+
+config.shadowTiddlers = {
+	StyleSheet: "",
+	MarkupPreHead: "<!--{{{-->\n<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>\n<!--}}}-->",
+	MarkupPostHead: "",
+	MarkupPreBody: "",
+	MarkupPostBody: "",
+	TabTimeline: '<<timeline>>',
+	TabAll: '<<list all>>',
+	TabTags: '<<allTags excludeLists>>',
+	TabMoreMissing: '<<list missing>>',
+	TabMoreOrphans: '<<list orphans>>',
+	TabMoreShadowed: '<<list shadowed>>',
+	AdvancedOptions: '<<options>>',
+	PluginManager: '<<plugins>>',
+	ImportTiddlers: '<<importTiddlers>>'
+};
+
+//--
+//-- Translateable strings
+//--
+
+// Strings in "double quotes" should be translated; strings in 'single quotes' should be left alone
+
+merge(config.options,{
+	txtUserName: "YourName"});
+
+merge(config.tasks,{
+	save: {text: "save", tooltip: "Save your changes to this TiddlyWiki", action: saveChanges},
+	sync: {text: "sync", tooltip: "Synchronise changes with other TiddlyWiki files and servers", content: '<<sync>>'},
+	importTask: {text: "import", tooltip: "Import tiddlers and plugins from other TiddlyWiki files and servers", content: '<<importTiddlers>>'},
+	tweak: {text: "tweak", tooltip: "Tweak the appearance and behaviour of TiddlyWiki", content: '<<options>>'},
+	plugins: {text: "plugins", tooltip: "Manage installed plugins", content: '<<plugins>>'}
+});
+
+// Options that can be set in the options panel and/or cookies
+merge(config.optionsDesc,{
+	txtUserName: "Username for signing your edits",
+	chkRegExpSearch: "Enable regular expressions for searches",
+	chkCaseSensitiveSearch: "Case-sensitive searching",
+	chkAnimate: "Enable animations",
+	chkSaveBackups: "Keep backup file when saving changes",
+	chkAutoSave: "Automatically save changes",
+	chkGenerateAnRssFeed: "Generate an RSS feed when saving changes",
+	chkSaveEmptyTemplate: "Generate an empty template when saving changes",
+	chkOpenInNewWindow: "Open external links in a new window",
+	chkToggleLinks: "Clicking on links to open tiddlers causes them to close",
+	chkHttpReadOnly: "Hide editing features when viewed over HTTP",
+	chkForceMinorUpdate: "Don't update modifier username and date when editing tiddlers",
+	chkConfirmDelete: "Require confirmation before deleting tiddlers",
+	chkInsertTabs: "Use the tab key to insert tab characters instead of moving between fields",
+	txtBackupFolder: "Name of folder to use for backups",
+	txtMaxEditRows: "Maximum number of rows in edit boxes",
+	txtFileSystemCharSet: "Default character set for saving changes (Firefox/Mozilla only)"});
+
+merge(config.messages,{
+	customConfigError: "Problems were encountered loading plugins. See PluginManager for details",
+	pluginError: "Error: %0",
+	pluginDisabled: "Not executed because disabled via 'systemConfigDisable' tag",
+	pluginForced: "Executed because forced via 'systemConfigForce' tag",
+	pluginVersionError: "Not executed because this plugin needs a newer version of TiddlyWiki",
+	nothingSelected: "Nothing is selected. You must select one or more items first",
+	savedSnapshotError: "It appears that this TiddlyWiki has been incorrectly saved. Please see http://www.tiddlywiki.com/#DownloadSoftware for details",
+	subtitleUnknown: "(unknown)",
+	undefinedTiddlerToolTip: "The tiddler '%0' doesn't yet exist",
+	shadowedTiddlerToolTip: "The tiddler '%0' doesn't yet exist, but has a pre-defined shadow value",
+	tiddlerLinkTooltip: "%0 - %1, %2",
+	externalLinkTooltip: "External link to %0",
+	noTags: "There are no tagged tiddlers",
+	notFileUrlError: "You need to save this TiddlyWiki to a file before you can save changes",
+	cantSaveError: "It's not possible to save changes. Possible reasons include:\n- your browser doesn't support saving (Firefox, Internet Explorer, Safari and Opera all work if properly configured)\n- the pathname to your TiddlyWiki file contains illegal characters\n- the TiddlyWiki HTML file has been moved or renamed",
+	invalidFileError: "The original file '%0' does not appear to be a valid TiddlyWiki",
+	backupSaved: "Backup saved",
+	backupFailed: "Failed to save backup file",
+	rssSaved: "RSS feed saved",
+	rssFailed: "Failed to save RSS feed file",
+	emptySaved: "Empty template saved",
+	emptyFailed: "Failed to save empty template file",
+	mainSaved: "Main TiddlyWiki file saved",
+	mainFailed: "Failed to save main TiddlyWiki file. Your changes have not been saved",
+	macroError: "Error in macro <<\%0>>",
+	macroErrorDetails: "Error while executing macro <<\%0>>:\n%1",
+	missingMacro: "No such macro",
+	overwriteWarning: "A tiddler named '%0' already exists. Choose OK to overwrite it",
+	unsavedChangesWarning: "WARNING! There are unsaved changes in TiddlyWiki\n\nChoose OK to save\nChoose CANCEL to discard",
+	confirmExit: "--------------------------------\n\nThere are unsaved changes in TiddlyWiki. If you continue you will lose those changes\n\n--------------------------------",
+	saveInstructions: "SaveChanges",
+	unsupportedTWFormat: "Unsupported TiddlyWiki format '%0'",
+	tiddlerSaveError: "Error when saving tiddler '%0'",
+	tiddlerLoadError: "Error when loading tiddler '%0'",
+	wrongSaveFormat: "Cannot save with storage format '%0'. Using standard format for save.",
+	invalidFieldName: "Invalid field name %0",
+	fieldCannotBeChanged: "Field '%0' cannot be changed",
+	loadingMissingTiddler: "Attempting to retrieve the tiddler '%0' from the '%1' server at:\n\n'%2' in the workspace '%3'"});
+
+merge(config.messages.messageClose,{
+	text: "close",
+	tooltip: "close this message area"});
+
+config.messages.backstage = {
+	open: {text: "backstage", tooltip: "Open the backstage area to perform authoring and editing tasks"},
+	close: {text: "close", tooltip: "Close the backstage area"},
+	prompt: "backstage: ",
+	decal: {
+		edit: {text: "edit", tooltip: "Edit the tiddler '%0'"}
+	}
+};
+
+config.messages.listView = {
+	tiddlerTooltip: "Click for the full text of this tiddler",
+	previewUnavailable: "(preview not available)"
+};
+
+config.messages.dates.months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November","December"];
+config.messages.dates.days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+config.messages.dates.shortMonths = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+config.messages.dates.shortDays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+// suffixes for dates, eg "1st","2nd","3rd"..."30th","31st"
+config.messages.dates.daySuffixes = ["st","nd","rd","th","th","th","th","th","th","th",
+		"th","th","th","th","th","th","th","th","th","th",
+		"st","nd","rd","th","th","th","th","th","th","th",
+		"st"];
+config.messages.dates.am = "am";
+config.messages.dates.pm = "pm";
+
+merge(config.messages.tiddlerPopup,{
+	});
+
+merge(config.views.wikified.tag,{
+	labelNoTags: "no tags",
+	labelTags: "tags: ",
+	openTag: "Open tag '%0'",
+	tooltip: "Show tiddlers tagged with '%0'",
+	openAllText: "Open all",
+	openAllTooltip: "Open all of these tiddlers",
+	popupNone: "No other tiddlers tagged with '%0'"});
+
+merge(config.views.wikified,{
+	defaultText: "The tiddler '%0' doesn't yet exist. Double-click to create it",
+	defaultModifier: "(missing)",
+	shadowModifier: "(built-in shadow tiddler)",
+	dateFormat: "DD MMM YYYY",
+	createdPrompt: "created"});
+
+merge(config.views.editor,{
+	tagPrompt: "Type tags separated with spaces, [[use double square brackets]] if necessary, or add existing",
+	defaultText: "Type the text for '%0'"});
+
+merge(config.views.editor.tagChooser,{
+	text: "tags",
+	tooltip: "Choose existing tags to add to this tiddler",
+	popupNone: "There are no tags defined",
+	tagTooltip: "Add the tag '%0'"});
+
+merge(config.messages,{
+	sizeTemplates:
+		[
+		{unit: 1024*1024*1024, template: "%0\u00a0GB"},
+		{unit: 1024*1024, template: "%0\u00a0MB"},
+		{unit: 1024, template: "%0\u00a0KB"},
+		{unit: 1, template: "%0\u00a0B"}
+		]});
+
+merge(config.macros.search,{
+	label: "search",
+	prompt: "Search this TiddlyWiki",
+	accessKey: "F",
+	successMsg: "%0 tiddlers found matching %1",
+	failureMsg: "No tiddlers found matching %0"});
+
+merge(config.macros.tagging,{
+	label: "tagging: ",
+	labelNotTag: "not tagging",
+	tooltip: "List of tiddlers tagged with '%0'"});
+
+merge(config.macros.timeline,{
+	dateFormat: "DD MMM YYYY"});
+
+merge(config.macros.allTags,{
+	tooltip: "Show tiddlers tagged with '%0'",
+	noTags: "There are no tagged tiddlers"});
+
+config.macros.list.all.prompt = "All tiddlers in alphabetical order";
+config.macros.list.missing.prompt = "Tiddlers that have links to them but are not defined";
+config.macros.list.orphans.prompt = "Tiddlers that are not linked to from any other tiddlers";
+config.macros.list.shadowed.prompt = "Tiddlers shadowed with default contents";
+config.macros.list.touched.prompt = "Tiddlers that have been modified locally";
+
+merge(config.macros.closeAll,{
+	label: "close all",
+	prompt: "Close all displayed tiddlers (except any that are being edited)"});
+
+merge(config.macros.permaview,{
+	label: "permaview",
+	prompt: "Link to an URL that retrieves all the currently displayed tiddlers"});
+
+merge(config.macros.saveChanges,{
+	label: "save changes",
+	prompt: "Save all tiddlers to create a new TiddlyWiki",
+	accessKey: "S"});
+
+merge(config.macros.newTiddler,{
+	label: "new tiddler",
+	prompt: "Create a new tiddler",
+	title: "New Tiddler",
+	accessKey: "N"});
+
+merge(config.macros.newJournal,{
+	label: "new journal",
+	prompt: "Create a new tiddler from the current date and time",
+	accessKey: "J"});
+
+merge(config.macros.options,{
+	wizardTitle: "Tweak advanced options",
+	step1Title: "These options are saved in cookies in your browser",
+	step1Html: "<input type='hidden' name='markList'></input><br><input type='checkbox' checked='false' name='chkUnknown'>Show unknown options</input>",
+	unknownDescription: "//(unknown)//",
+	listViewTemplate: {
+		columns: [
+			{name: 'Option', field: 'option', title: "Option", type: 'String'},
+			{name: 'Description', field: 'description', title: "Description", type: 'WikiText'},
+			{name: 'Name', field: 'name', title: "Name", type: 'String'}
+			],
+		rowClasses: [
+			{className: 'lowlight', field: 'lowlight'} 
+			]}
+	});
+
+merge(config.macros.plugins,{
+	wizardTitle: "Manage plugins",
+	step1Title: "Currently loaded plugins",
+	step1Html: "<input type='hidden' name='markList'></input>", // DO NOT TRANSLATE
+	skippedText: "(This plugin has not been executed because it was added since startup)",
+	noPluginText: "There are no plugins installed",
+	confirmDeleteText: "Are you sure you want to delete these plugins:\n\n%0",
+	removeLabel: "remove systemConfig tag",
+	removePrompt: "Remove systemConfig tag",
+	deleteLabel: "delete",
+	deletePrompt: "Delete these tiddlers forever",
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Size', field: 'size', tiddlerLink: 'size', title: "Size", type: 'Size'},
+			{name: 'Forced', field: 'forced', title: "Forced", tag: 'systemConfigForce', type: 'TagCheckbox'},
+			{name: 'Disabled', field: 'disabled', title: "Disabled", tag: 'systemConfigDisable', type: 'TagCheckbox'},
+			{name: 'Executed', field: 'executed', title: "Loaded", type: 'Boolean', trueText: "Yes", falseText: "No"},
+			{name: 'Startup Time', field: 'startupTime', title: "Startup Time", type: 'String'},
+			{name: 'Error', field: 'error', title: "Status", type: 'Boolean', trueText: "Error", falseText: "OK"},
+			{name: 'Log', field: 'log', title: "Log", type: 'StringList'}
+			],
+		rowClasses: [
+			{className: 'error', field: 'error'},
+			{className: 'warning', field: 'warning'}
+			]}
+	});
+
+merge(config.macros.toolbar,{
+	moreLabel: "more",
+	morePrompt: "Reveal further commands"
+	});
+
+merge(config.macros.refreshDisplay,{
+	label: "refresh",
+	prompt: "Redraw the entire TiddlyWiki display"
+	});
+
+merge(config.macros.importTiddlers,{
+	readOnlyWarning: "You cannot import into a read-only TiddlyWiki file. Try opening it from a file:// URL",
+	wizardTitle: "Import tiddlers from another file or server",
+	step1Title: "Step 1: Locate the server or TiddlyWiki file",
+	step1Html: "Specify the type of the server: <select name='selTypes'><option value=''>Choose...</option></select><br>Enter the URL or pathname here: <input type='text' size=50 name='txtPath'><br>...or browse for a file: <input type='file' size=50 name='txtBrowse'><br><hr>...or select a pre-defined feed: <select name='selFeeds'><option value=''>Choose...</option></select>",
+	openLabel: "open",
+	openPrompt: "Open the connection to this file or server",
+	openError: "There were problems fetching the tiddlywiki file",
+	statusOpenHost: "Opening the host",
+	statusGetWorkspaceList: "Getting the list of available workspaces",
+	step2Title: "Step 2: Choose the workspace",
+	step2Html: "Enter a workspace name: <input type='text' size=50 name='txtWorkspace'><br>...or select a workspace: <select name='selWorkspace'><option value=''>Choose...</option></select>",
+	cancelLabel: "cancel",
+	cancelPrompt: "Cancel this import",
+	statusOpenWorkspace: "Opening the workspace",
+	statusGetTiddlerList: "Getting the list of available tiddlers",
+	step3Title: "Step 3: Choose the tiddlers to import",
+	step3Html: "<input type='hidden' name='markList'></input><br><input type='checkbox' checked='true' name='chkSync'>Keep these tiddlers linked to this server so that you can synchronise subsequent changes</input><br><input type='checkbox' name='chkSave'>Save the details of this server in a 'systemServer' tiddler called:</input> <input type='text' size=25 name='txtSaveTiddler'>",
+	importLabel: "import",
+	importPrompt: "Import these tiddlers",
+	confirmOverwriteText: "Are you sure you want to overwrite these tiddlers:\n\n%0",
+	step4Title: "Step 4: Importing %0 tiddler(s)",
+	step4Html: "<input type='hidden' name='markReport'></input>", // DO NOT TRANSLATE
+	doneLabel: "done",
+	donePrompt: "Close this wizard",
+	statusDoingImport: "Importing tiddlers",
+	statusDoneImport: "All tiddlers imported",
+	systemServerNamePattern: "%2 on %1",
+	systemServerNamePatternNoWorkspace: "%1",
+	confirmOverwriteSaveTiddler: "The tiddler '%0' already exists. Click 'OK' to overwrite it with the details of this server, or 'Cancel' to leave it unchanged",
+	serverSaveTemplate: "|''Type:''|%0|\n|''URL:''|%1|\n|''Workspace:''|%2|\n\nThis tiddler was automatically created to record the details of this server",
+	serverSaveModifier: "(System)",
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Size', field: 'size', tiddlerLink: 'size', title: "Size", type: 'Size'},
+			{name: 'Tags', field: 'tags', title: "Tags", type: 'Tags'}
+			],
+		rowClasses: [
+			]}
+	});
+
+merge(config.macros.sync,{
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Server Type', field: 'serverType', title: "Server type", type: 'String'},
+			{name: 'Server Host', field: 'serverHost', title: "Server host", type: 'String'},
+			{name: 'Server Workspace', field: 'serverWorkspace', title: "Server workspace", type: 'String'},
+			{name: 'Status', field: 'status', title: "Synchronisation status", type: 'String'},
+			{name: 'Server URL', field: 'serverUrl', title: "Server URL", text: "View", type: 'Link'}
+			],
+		rowClasses: [
+			],
+		buttons: [
+			{caption: "Sync these tiddlers", name: 'sync'}
+			]},
+	wizardTitle: "Synchronize with external servers and files",
+	step1Title: "Choose the tiddlers you want to synchronize",
+	step1Html: "<input type='hidden' name='markList'></input>", // DO NOT TRANSLATE
+	syncLabel: "sync",
+	syncPrompt: "Sync these tiddlers",
+	hasChanged: "Changed while unplugged",
+	hasNotChanged: "Unchanged while unplugged",
+	syncStatusList: {
+		none: {text: "...", color: "none"},
+		changedServer: {text: "Changed on server", color: '#80ff80'},
+		changedLocally: {text: "Changed while unplugged", color: '#80ff80'},
+		changedBoth: {text: "Changed while unplugged and on server", color: '#ff8080'},
+		notFound: {text: "Not found on server", color: '#ffff80'},
+		putToServer: {text: "Saved update on server", color: '#ff80ff'},
+		gotFromServer: {text: "Retrieved update from server", color: '#80ffff'}
+		}
+	});
+
+merge(config.macros.annotations,{
+	});
+
+merge(config.commands.closeTiddler,{
+	text: "close",
+	tooltip: "Close this tiddler"});
+
+merge(config.commands.closeOthers,{
+	text: "close others",
+	tooltip: "Close all other tiddlers"});
+
+merge(config.commands.editTiddler,{
+	text: "edit",
+	tooltip: "Edit this tiddler",
+	readOnlyText: "view",
+	readOnlyTooltip: "View the source of this tiddler"});
+
+merge(config.commands.saveTiddler,{
+	text: "done",
+	tooltip: "Save changes to this tiddler"});
+
+merge(config.commands.cancelTiddler,{
+	text: "cancel",
+	tooltip: "Undo changes to this tiddler",
+	warning: "Are you sure you want to abandon your changes to '%0'?",
+	readOnlyText: "done",
+	readOnlyTooltip: "View this tiddler normally"});
+
+merge(config.commands.deleteTiddler,{
+	text: "delete",
+	tooltip: "Delete this tiddler",
+	warning: "Are you sure you want to delete '%0'?"});
+
+merge(config.commands.permalink,{
+	text: "permalink",
+	tooltip: "Permalink for this tiddler"});
+
+merge(config.commands.references,{
+	text: "references",
+	tooltip: "Show tiddlers that link to this one",
+	popupNone: "No references"});
+
+merge(config.commands.jump,{
+	text: "jump",
+	tooltip: "Jump to another open tiddler"});
+
+merge(config.commands.syncing,{
+	text: "syncing",
+	tooltip: "Control synchronisation of this tiddler with a server or external file",
+	currentlySyncing: "<div>Currently syncing via <span class='popupHighlight'>'%0'</span> to:</"+"div><div>host: <span class='popupHighlight'>%1</span></"+"div><div>workspace: <span class='popupHighlight'>%2</span></"+"div>", // Note escaping of closing <div> tag
+	notCurrentlySyncing: "Not currently syncing",
+	captionUnSync: "Stop synchronising this tiddler",
+	chooseServer: "Synchronise this tiddler with another server:",
+	currServerMarker: "\u25cf ",
+	notCurrServerMarker: "  "});
+
+merge(config.commands.fields,{
+	text: "fields",
+	tooltip: "Show the extended fields of this tiddler",
+	emptyText: "There are no extended fields for this tiddler",
+	listViewTemplate: {
+		columns: [
+			{name: 'Field', field: 'field', title: "Field", type: 'String'},
+			{name: 'Value', field: 'value', title: "Value", type: 'String'}
+			],
+		rowClasses: [
+			],
+		buttons: [
+			]}});
+
+merge(config.shadowTiddlers,{
+	DefaultTiddlers: "GettingStarted",
+	MainMenu: "GettingStarted",
+	SiteTitle: "My TiddlyWiki",
+	SiteSubtitle: "a reusable non-linear personal web notebook",
+	SiteUrl: "http://www.tiddlywiki.com/",
+	SideBarOptions: '<<search>><<closeAll>><<permaview>><<newTiddler>><<newJournal "DD MMM YYYY">><<saveChanges>><<slider chkSliderOptionsPanel OptionsPanel "options »" "Change TiddlyWiki advanced options">>',
+	SideBarTabs: '<<tabs txtMainTab "Timeline" "Timeline" TabTimeline "All" "All tiddlers" TabAll "Tags" "All tags" TabTags "More" "More lists" TabMore>>',
+	TabMore: '<<tabs txtMoreTab "Missing" "Missing tiddlers" TabMoreMissing "Orphans" "Orphaned tiddlers" TabMoreOrphans "Shadowed" "Shadowed tiddlers" TabMoreShadowed>>'});
+
+merge(config.annotations,{
+	AdvancedOptions: "This shadow tiddler provides access to several advanced options",
+	ColorPalette: "These values in this shadow tiddler determine the colour scheme of the ~TiddlyWiki user interface",
+	DefaultTiddlers: "The tiddlers listed in this shadow tiddler will be automatically displayed when ~TiddlyWiki starts up",
+	EditTemplate: "The HTML template in this shadow tiddler determines how tiddlers look while they are being edited",
+	GettingStarted: "This shadow tiddler provides basic usage instructions",
+	ImportTiddlers: "This shadow tiddler provides access to importing tiddlers",
+	MainMenu: "This shadow tiddler is used as the contents of the main menu in the left-hand column of the screen",
+	MarkupPreHead: "This tiddler is inserted at the top of the <head> section of the TiddlyWiki HTML file",
+	MarkupPostHead: "This tiddler is inserted at the bottom of the <head> section of the TiddlyWiki HTML file",
+	MarkupPreBody: "This tiddler is inserted at the top of the <body> section of the TiddlyWiki HTML file",
+	MarkupPostBody: "This tiddler is inserted at the end of the <body> section of the TiddlyWiki HTML file immediately before the script block",
+	OptionsPanel: "This shadow tiddler is used as the contents of the options panel slider in the right-hand sidebar",
+	PageTemplate: "The HTML template in this shadow tiddler determines the overall ~TiddlyWiki layout",
+	PluginManager: "This shadow tiddler provides access to the plugin manager",
+	SideBarOptions: "This shadow tiddler is used as the contents of the option panel in the right-hand sidebar",
+	SideBarTabs: "This shadow tiddler is used as the contents of the tabs panel in the right-hand sidebar",
+	SiteSubtitle: "This shadow tiddler is used as the second part of the page title",
+	SiteTitle: "This shadow tiddler is used as the first part of the page title",
+	SiteUrl: "This shadow tiddler should be set to the full target URL for publication",
+	StyleSheetColours: "This shadow tiddler contains CSS definitions related to the color of page elements",
+	StyleSheet: "This tiddler can contain custom CSS definitions",
+	StyleSheetLayout: "This shadow tiddler contains CSS definitions related to the layout of page elements",
+	StyleSheetLocale: "This shadow tiddler contains CSS definitions related to the translation locale",
+	StyleSheetPrint: "This shadow tiddler contains CSS definitions for printing",
+	TabAll: "This shadow tiddler contains the contents of the 'All' tab in the right-hand sidebar",
+	TabMore: "This shadow tiddler contains the contents of the 'More' tab in the right-hand sidebar",
+	TabMoreMissing: "This shadow tiddler contains the contents of the 'Missing' tab in the right-hand sidebar",
+	TabMoreOrphans: "This shadow tiddler contains the contents of the 'Orphans' tab in the right-hand sidebar",
+	TabMoreShadowed: "This shadow tiddler contains the contents of the 'Shadowed' tab in the right-hand sidebar",
+	TabTags: "This shadow tiddler contains the contents of the 'Tags' tab in the right-hand sidebar",
+	TabTimeline: "This shadow tiddler contains the contents of the 'Timeline' tab in the right-hand sidebar",
+	ViewTemplate: "The HTML template in this shadow tiddler determines how tiddlers look"
+	});
+
+//--
+//-- Main
+//--
+
+var params = null; // Command line parameters
+var store = null; // TiddlyWiki storage
+var story = null; // Main story
+var formatter = null; // Default formatters for the wikifier
+config.parsers = {}; // Hashmap of alternative parsers for the wikifier
+var anim = new Animator(); // Animation engine
+var readOnly = false; // Whether we're in readonly mode
+var highlightHack = null; // Embarrassing hack department...
+var hadConfirmExit = false; // Don't warn more than once
+var safeMode = false; // Disable all plugins and cookies
+var installedPlugins = []; // Information filled in when plugins are executed
+var startingUp = false; // Whether we're in the process of starting up
+var pluginInfo,tiddler; // Used to pass information to plugins in loadPlugins()
+
+// Whether to use the JavaSaver applet
+var useJavaSaver = config.browser.isSafari || config.browser.isOpera;
+
+// Starting up
+function main()
+{
+	var t9,t8,t7,t6,t5,t4,t3,t2,t1,t0 = new Date();
+	startingUp = true;
+	window.onbeforeunload = function(e) {if(window.confirmExit) return confirmExit();};
+	params = getParameters();
+	if(params)
+		params = params.parseParams("open",null,false);
+	store = new TiddlyWiki();
+	invokeParamifier(params,"oninit");
+	story = new Story("tiddlerDisplay","tiddler");
+	addEvent(document,"click",Popup.onDocumentClick);
+	saveTest();
+	loadOptionsCookie();
+	for(var s=0; s<config.notifyTiddlers.length; s++)
+		store.addNotification(config.notifyTiddlers[s].name,config.notifyTiddlers[s].notify);
+	t1 = new Date();
+	store.loadFromDiv("storeArea","store",true);
+	t2 = new Date();
+	loadShadowTiddlers();
+	t3 = new Date();
+	invokeParamifier(params,"onload");
+	t4 = new Date();
+	readOnly = (window.location.protocol == "file:") ? false : config.options.chkHttpReadOnly;
+	var pluginProblem = loadPlugins();
+	t5 = new Date();
+	formatter = new Formatter(config.formatters);
+	invokeParamifier(params,"onconfig");
+	t6 = new Date();
+	store.notifyAll();
+	t7 = new Date();
+	restart();
+	t8 = new Date();
+	if(pluginProblem) {
+		story.displayTiddler(null,"PluginManager");
+		displayMessage(config.messages.customConfigError);
+	}
+	for(var m in config.macros) {
+		if(config.macros[m].init)
+			config.macros[m].init();
+	}
+	if(!readOnly)
+		backstage.init();
+	t9 = new Date();
+	if(config.options.chkDisplayStartupTime) {
+		displayMessage("Load in " + (t2-t1) + " ms");
+		displayMessage("Loadshadows in " + (t3-t2) + " ms");
+		displayMessage("Loadplugins in " + (t5-t4) + " ms");
+		displayMessage("Notify in " + (t7-t6) + " ms");
+		displayMessage("Restart in " + (t8-t7) + " ms");
+		displayMessage("Total startup in " + (t9-t0) + " ms");
+	}
+	startingUp = false;
+}
+
+// Restarting
+function restart()
+{
+	invokeParamifier(params,"onstart");
+	if(story.isEmpty()) {
+		var defaultParams = store.getTiddlerText("DefaultTiddlers").parseParams("open",null,false);
+		invokeParamifier(defaultParams,"onstart");
+	}
+	window.scrollTo(0,0);
+}
+
+function saveTest()
+{
+	var s = document.getElementById("saveTest");
+	if(s.hasChildNodes())
+		alert(config.messages.savedSnapshotError);
+	s.appendChild(document.createTextNode("savetest"));
+}
+
+function loadShadowTiddlers()
+{
+	var shadows = new TiddlyWiki();
+	shadows.loadFromDiv("shadowArea","shadows",true);
+	shadows.forEachTiddler(function(title,tiddler){config.shadowTiddlers[title] = tiddler.text;});
+	delete shadows;
+}
+
+function loadPlugins()
+{
+	if(safeMode)
+		return false;
+	var tiddlers = store.getTaggedTiddlers("systemConfig");
+	var toLoad = [];
+	var nLoaded = 0;
+	var map = {};
+	var nPlugins = tiddlers.length;
+	installedPlugins = [];
+	for(var i=0; i<nPlugins; i++) {
+		var p = getPluginInfo(tiddlers[i]);
+		installedPlugins[i] = p;
+		var n = p.Name;
+		if(n) 
+			map[n] = p;
+		if(n = p.Source) 
+			map[n] = p;
+	}
+	var visit = function(p) {
+		if(!p || p.done)
+			return;
+		p.done = 1;
+		var reqs = p.Requires;
+		if(reqs) {
+			reqs = reqs.readBracketedList();
+			for(var i=0; i<reqs.length; i++)
+				visit(map[reqs[i]]);
+		}
+		toLoad.push(p);
+	};
+	for(i=0; i<nPlugins; i++) 
+		visit(installedPlugins[i]);	
+	for(i=0; i<toLoad.length; i++) {
+		p = toLoad[i];
+		pluginInfo = p;
+		tiddler = p.tiddler;
+		if(isPluginExecutable(p)) {
+			if(isPluginEnabled(p)) {
+				p.executed = true;
+				var startTime = new Date();
+				try {
+					if(tiddler.text)
+						window.eval(tiddler.text);
+					nLoaded++;
+				} catch(ex) {
+					p.log.push(config.messages.pluginError.format([exceptionText(ex)]));
+					p.error = true;
+				}
+				pluginInfo.startupTime = String((new Date()) - startTime) + "ms"; 
+			} else {
+				nPlugins--;
+			}
+		} else {
+			p.warning = true;
+		}
+	}
+	return nLoaded != nPlugins;
+}
+
+function getPluginInfo(tiddler)
+{
+	var p = store.getTiddlerSlices(tiddler.title,["Name","Description","Version","Requires","CoreVersion","Date","Source","Author","License","Browsers"]);
+	p.tiddler = tiddler;
+	p.title = tiddler.title;
+	p.log = [];
+	return p;
+}
+
+// Check that a particular plugin is valid for execution
+function isPluginExecutable(plugin)
+{
+	if(plugin.tiddler.isTagged("systemConfigForce"))
+		return verifyTail(plugin,true,config.messages.pluginForced);
+	if(plugin["CoreVersion"]) {
+		var coreVersion = plugin["CoreVersion"].split(".");
+		var w = parseInt(coreVersion[0]) - version.major;
+		if(w == 0 && coreVersion[1])
+			w = parseInt(coreVersion[1]) - version.minor;
+		if(w == 0 && coreVersion[2])
+		 	w = parseInt(coreVersion[2]) - version.revision;
+		if(w > 0)
+			return verifyTail(plugin,false,config.messages.pluginVersionError);
+		}
+	return true;
+}
+
+function isPluginEnabled(plugin)
+{
+	if(plugin.tiddler.isTagged("systemConfigDisable"))
+		return verifyTail(plugin,false,config.messages.pluginDisabled);
+	return true;
+}
+
+function verifyTail(plugin,result,message)
+{
+	plugin.log.push(message);
+	return result;
+}
+
+function invokeMacro(place,macro,params,wikifier,tiddler)
+{
+	try {
+		var m = config.macros[macro];
+		if(m && m.handler)
+			m.handler(place,macro,params.readMacroParams(),wikifier,params,tiddler);
+		else
+			createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,config.messages.missingMacro]));
+	} catch(ex) {
+		createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,ex.toString()]));
+	}
+}
+
+//--
+//-- Paramifiers
+//--
+
+function getParameters()
+{
+	var p = null;
+	if(window.location.hash) {
+		p = decodeURI(window.location.hash.substr(1));
+		if(config.browser.firefoxDate != null && config.browser.firefoxDate[1] < "20051111")
+			p = convertUTF8ToUnicode(p);
+	}
+	return p;
+}
+
+function invokeParamifier(params,handler)
+{
+	if(!params || params.length == undefined || params.length <= 1)
+		return;
+	for(var t=1; t<params.length; t++) {
+		var p = config.paramifiers[params[t].name];
+		if(p && p[handler] instanceof Function)
+			p[handler](params[t].value);
+	}
+}
+
+config.paramifiers = {};
+
+config.paramifiers.start = {
+	oninit: function(v) {
+		safeMode = v.toLowerCase() == "safe";
+	}
+};
+
+config.paramifiers.open = {
+	onstart: function(v) {
+		story.displayTiddler("bottom",v,null,false,null);
+	}
+};
+
+config.paramifiers.story = {
+	onstart: function(v) {
+		var list = store.getTiddlerText(v,"").parseParams("open",null,false);
+		invokeParamifier(list,"onstart");
+	}
+};
+
+config.paramifiers.search = {
+	onstart: function(v) {
+		story.search(v,false,false);
+	}
+};
+
+config.paramifiers.searchRegExp = {
+	onstart: function(v) {
+		story.prototype.search(v,false,true);
+	}
+};
+
+config.paramifiers.tag = {
+	onstart: function(v) {
+		var tagged = store.getTaggedTiddlers(v,"title");
+		for(var t=0; t<tagged.length; t++)
+			story.displayTiddler("bottom",tagged[t].title,null,false,null);
+	}
+};
+
+config.paramifiers.newTiddler = {
+	onstart: function(v) {
+		if(!readOnly) {
+			story.displayTiddler(null,v,DEFAULT_EDIT_TEMPLATE);
+			story.focusTiddler(v,"text");
+		}
+	}
+};
+
+config.paramifiers.newJournal = {
+	onstart: function(v) {
+		if(!readOnly) {
+			var now = new Date();
+			var title = now.formatString(v.trim());
+			story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE);
+			story.focusTiddler(title,"text");
+		}
+	}
+};
+
+config.paramifiers.readOnly = {
+	onconfig: function(v) {
+		var p = v.toLowerCase();
+		readOnly = p == "yes" ? true : (p == "no" ? false : readOnly);
+	}
+};
+
+//--
+//-- Formatter helpers
+//--
+
+function Formatter(formatters)
+{
+	this.formatters = [];
+	var pattern = [];
+	for(var n=0; n<formatters.length; n++) {
+		pattern.push("(" + formatters[n].match + ")");
+		this.formatters.push(formatters[n]);
+	}
+	this.formatterRegExp = new RegExp(pattern.join("|"),"mg");
+}
+
+config.formatterHelpers = {
+
+	createElementAndWikify: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,this.element),this.termRegExp);
+	},
+	
+	inlineCssHelper: function(w)
+	{
+		var styles = [];
+		config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			var s,v;
+			if(lookaheadMatch[1]) {
+				s = lookaheadMatch[1].unDash();
+				v = lookaheadMatch[2];
+			} else {
+				s = lookaheadMatch[3].unDash();
+				v = lookaheadMatch[4];
+			}
+			if (s=="bgcolor")
+				s = "backgroundColor";
+			styles.push({style: s, value: v});
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+			config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+		}
+		return styles;
+	},
+
+	applyCssHelper: function(e,styles)
+	{
+		for(var t=0; t< styles.length; t++) {
+			try {
+				e.style[styles[t].style] = styles[t].value;
+			} catch (ex) {
+			}
+		}
+	},
+
+	enclosedTextHelper: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var text = lookaheadMatch[1];
+			if(config.browser.isIE)
+				text = text.replace(/\n/g,"\r");
+			createTiddlyElement(w.output,this.element,null,null,text);
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+		}
+	},
+
+	isExternalLink: function(link)
+	{
+		if(store.tiddlerExists(link) || store.isShadowTiddler(link)) {
+			return false;
+		}
+		var urlRegExp = new RegExp(config.textPrimitives.urlPattern,"mg");
+		if(urlRegExp.exec(link)) {
+			return true;
+		}
+		if (link.indexOf(".")!=-1 || link.indexOf("\\")!=-1 || link.indexOf("/")!=-1){
+			return true;
+		}
+		return false;
+	}
+
+};
+
+//--
+//-- Standard formatters
+//--
+
+config.formatters = [
+{
+	name: "table",
+	match: "^\\|(?:[^\\n]*)\\|(?:[fhck]?)$",
+	lookaheadRegExp: /^\|([^\n]*)\|([fhck]?)$/mg,
+	rowTermRegExp: /(\|(?:[fhck]?)$\n?)/mg,
+	cellRegExp: /(?:\|([^\n\|]*)\|)|(\|[fhck]?$\n?)/mg,
+	cellTermRegExp: /((?:\x20*)\|)/mg,
+	rowTypes: {"c":"caption", "h":"thead", "":"tbody", "f":"tfoot"},
+
+	handler: function(w)
+	{
+		var table = createTiddlyElement(w.output,"table",null,"twtable");
+		var prevColumns = [];
+		var currRowType = null;
+		var rowContainer;
+		var rowCount = 0;
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			var nextRowType = lookaheadMatch[2];
+			if(nextRowType == "k") {
+				table.className = lookaheadMatch[1];
+				w.nextMatch += lookaheadMatch[0].length+1;
+			} else {
+				if(nextRowType != currRowType) {
+					rowContainer = createTiddlyElement(table,this.rowTypes[nextRowType]);
+					currRowType = nextRowType;
+				}
+				if(currRowType == "c") {
+					// Caption
+					w.nextMatch++;
+					if(rowContainer != table.firstChild)
+						table.insertBefore(rowContainer,table.firstChild);
+					rowContainer.setAttribute("align",rowCount == 0?"top":"bottom");
+					w.subWikifyTerm(rowContainer,this.rowTermRegExp);
+				} else {
+					this.rowHandler(w,createTiddlyElement(rowContainer,"tr",null,(rowCount&1)?"oddRow":"evenRow"),prevColumns);
+					rowCount++;
+				}
+			}
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		}
+	},
+	rowHandler: function(w,e,prevColumns)
+	{
+		var col = 0;
+		var colSpanCount = 1;
+		var prevCell = null;
+		this.cellRegExp.lastIndex = w.nextMatch;
+		var cellMatch = this.cellRegExp.exec(w.source);
+		while(cellMatch && cellMatch.index == w.nextMatch) {
+			if(cellMatch[1] == "~") {
+				// Rowspan
+				var last = prevColumns[col];
+				if(last) {
+					last.rowSpanCount++;
+					last.element.setAttribute("rowspan",last.rowSpanCount);
+					last.element.setAttribute("rowSpan",last.rowSpanCount); // Needed for IE
+					last.element.valign = "center";
+				}
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+			} else if(cellMatch[1] == ">") {
+				// Colspan
+				colSpanCount++;
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+			} else if(cellMatch[2]) {
+				// End of row
+				if(prevCell && colSpanCount > 1) {
+					prevCell.setAttribute("colspan",colSpanCount);
+					prevCell.setAttribute("colSpan",colSpanCount); // Needed for IE
+				}
+				w.nextMatch = this.cellRegExp.lastIndex;
+				break;
+			} else {
+				// Cell
+				w.nextMatch++;
+				var styles = config.formatterHelpers.inlineCssHelper(w);
+				var spaceLeft = false;
+				var chr = w.source.substr(w.nextMatch,1);
+				while(chr == " ") {
+					spaceLeft = true;
+					w.nextMatch++;
+					chr = w.source.substr(w.nextMatch,1);
+				}
+				var cell;
+				if(chr == "!") {
+					cell = createTiddlyElement(e,"th");
+					w.nextMatch++;
+				} else {
+					cell = createTiddlyElement(e,"td");
+				}
+				prevCell = cell;
+				prevColumns[col] = {rowSpanCount:1,element:cell};
+				if(colSpanCount > 1) {
+					cell.setAttribute("colspan",colSpanCount);
+					cell.setAttribute("colSpan",colSpanCount); // Needed for IE
+					colSpanCount = 1;
+				}
+				config.formatterHelpers.applyCssHelper(cell,styles);
+				w.subWikifyTerm(cell,this.cellTermRegExp);
+				if(w.matchText.substr(w.matchText.length-2,1) == " ") // spaceRight
+					cell.align = spaceLeft ? "center" : "left";
+				else if(spaceLeft)
+					cell.align = "right";
+				w.nextMatch--;
+			}
+			col++;
+			this.cellRegExp.lastIndex = w.nextMatch;
+			cellMatch = this.cellRegExp.exec(w.source);
+		}
+	}
+},
+
+{
+	name: "heading",
+	match: "^!{1,6}",
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,"h" + w.matchLength),this.termRegExp);
+	}
+},
+
+{
+	name: "list",
+	match: "^(?:[\\*#;:]+)",
+	lookaheadRegExp: /^(?:(?:(\*)|(#)|(;)|(:))+)/mg,
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		var stack = [w.output];
+		var currLevel = 0, currType = null;
+		var listLevel, listType, itemType;
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			if(lookaheadMatch[1]) {
+				listType = "ul";
+				itemType = "li";
+			} else if(lookaheadMatch[2]) {
+				listType = "ol";
+				itemType = "li";
+			} else if(lookaheadMatch[3]) {
+				listType = "dl";
+				itemType = "dt";
+			} else if(lookaheadMatch[4]) {
+				listType = "dl";
+				itemType = "dd";
+			}
+			listLevel = lookaheadMatch[0].length;
+			w.nextMatch += lookaheadMatch[0].length;
+			var t;
+			if(listLevel > currLevel) {
+				for(t=currLevel; t<listLevel; t++) {
+					var target = (currLevel == 0) ? stack[stack.length-1] : stack[stack.length-1].lastChild;
+					stack.push(createTiddlyElement(target,listType));
+				}
+			} else if(listLevel < currLevel) {
+				for(t=currLevel; t>listLevel; t--)
+					stack.pop();
+			} else if(listLevel == currLevel && listType != currType) {
+				stack.pop();
+				stack.push(createTiddlyElement(stack[stack.length-1].lastChild,listType));
+			}
+			currLevel = listLevel;
+			currType = listType;
+			var e = createTiddlyElement(stack[stack.length-1],itemType);
+			w.subWikifyTerm(e,this.termRegExp);
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		}
+	}
+},
+
+{
+	name: "quoteByBlock",
+	match: "^<<<\\n",
+	termRegExp: /(^<<<(\n|$))/mg,
+	element: "blockquote",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "quoteByLine",
+	match: "^>+",
+	lookaheadRegExp: /^>+/mg,
+	termRegExp: /(\n)/mg,
+	element: "blockquote",
+	handler: function(w)
+	{
+		var stack = [w.output];
+		var currLevel = 0;
+		var newLevel = w.matchLength;
+		var t;
+		do {
+			if(newLevel > currLevel) {
+				for(t=currLevel; t<newLevel; t++)
+					stack.push(createTiddlyElement(stack[stack.length-1],this.element));
+			} else if(newLevel < currLevel) {
+				for(t=currLevel; t>newLevel; t--)
+					stack.pop();
+			}
+			currLevel = newLevel;
+			w.subWikifyTerm(stack[stack.length-1],this.termRegExp);
+			createTiddlyElement(stack[stack.length-1],"br");
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+			var matched = lookaheadMatch && lookaheadMatch.index == w.nextMatch;
+			if(matched) {
+				newLevel = lookaheadMatch[0].length;
+				w.nextMatch += lookaheadMatch[0].length;
+			}
+		} while(matched);
+	}
+},
+
+{
+	name: "rule",
+	match: "^----+$\\n?",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"hr");
+	}
+},
+
+{
+	name: "monospacedByLine",
+	match: "^\\{\\{\\{\\n",
+	lookaheadRegExp: /^\{\{\{\n((?:^[^\n]*\n)+?)(^\}\}\}$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForCSS",
+	match: "^/\\*\\{\\{\\{\\*/\\n",
+	lookaheadRegExp: /\/\*\{\{\{\*\/\n*((?:^[^\n]*\n)+?)(\n*^\/\*\}\}\}\*\/$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForPlugin",
+	match: "^//\\{\\{\\{\\n",
+	lookaheadRegExp: /^\/\/\{\{\{\n\n*((?:^[^\n]*\n)+?)(\n*^\/\/\}\}\}$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForTemplate",
+	match: "^<!--\\{\\{\\{-->\\n",
+	lookaheadRegExp: /<!--\{\{\{-->\n*((?:^[^\n]*\n)+?)(\n*^<!--\}\}\}-->$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "wikifyCommentForPlugin",
+	match: "^/\\*\\*\\*\\n",
+	termRegExp: /(^\*\*\*\/\n)/mg,
+	handler: function(w)
+	{
+		w.subWikifyTerm(w.output,this.termRegExp);
+	}
+},
+
+{
+	name: "wikifyCommentForTemplate",
+	match: "^<!---\\n",
+	termRegExp: /(^--->\n)/mg,
+	handler: function(w) 
+	{
+		w.subWikifyTerm(w.output,this.termRegExp);
+	}
+},
+
+{
+	name: "macro",
+	match: "<<",
+	lookaheadRegExp: /<<([^>\s]+)(?:\s*)((?:[^>]|(?:>(?!>)))*)>>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart && lookaheadMatch[1]) {
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			invokeMacro(w.output,lookaheadMatch[1],lookaheadMatch[2],w,w.tiddler);
+		}
+	}
+},
+
+{
+	name: "prettyLink",
+	match: "\\[\\[",
+	lookaheadRegExp: /\[\[(.*?)(?:\|(~)?(.*?))?\]\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var e;
+			var text = lookaheadMatch[1];
+			if(lookaheadMatch[3]) {
+				// Pretty bracketted link
+				var link = lookaheadMatch[3];
+				e = (!lookaheadMatch[2] && config.formatterHelpers.isExternalLink(link)) ?
+						createExternalLink(w.output,link) : createTiddlyLink(w.output,link,false,null,w.isStatic,w.tiddler);
+			} else {
+				// Simple bracketted link
+				e = createTiddlyLink(w.output,text,false,null,w.isStatic,w.tiddler);
+			}
+			createTiddlyText(e,text);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "unWikiLink",
+	match: config.textPrimitives.unWikiLink+config.textPrimitives.wikiLink,
+	handler: function(w)
+	{
+		w.outputText(w.output,w.matchStart+1,w.nextMatch);
+	}
+},
+
+{
+	name: "wikiLink",
+	match: config.textPrimitives.wikiLink,
+	handler: function(w)
+	{
+		if(w.matchStart > 0) {
+			var preRegExp = new RegExp(config.textPrimitives.anyLetterStrict,"mg");
+			preRegExp.lastIndex = w.matchStart-1;
+			var preMatch = preRegExp.exec(w.source);
+			if(preMatch.index == w.matchStart-1) {
+				w.outputText(w.output,w.matchStart,w.nextMatch);
+				return;
+			}
+		}
+		if(w.autoLinkWikiWords == true || store.isShadowTiddler(w.matchText)) {
+			var link = createTiddlyLink(w.output,w.matchText,false,null,w.isStatic,w.tiddler);
+			w.outputText(link,w.matchStart,w.nextMatch);
+		} else {
+			w.outputText(w.output,w.matchStart,w.nextMatch);
+		}
+	}
+},
+
+{
+	name: "urlLink",
+	match: config.textPrimitives.urlPattern,
+	handler: function(w)
+	{
+		w.outputText(createExternalLink(w.output,w.matchText),w.matchStart,w.nextMatch);
+	}
+},
+
+{
+	name: "image",
+	match: "\\[[<>]?[Ii][Mm][Gg]\\[",
+	lookaheadRegExp: /\[([<]?)(>?)[Ii][Mm][Gg]\[(?:([^\|\]]+)\|)?([^\[\]\|]+)\](?:\[([^\]]*)\])?\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var e = w.output;
+			if(lookaheadMatch[5]) {
+				var link = lookaheadMatch[5];
+				e = config.formatterHelpers.isExternalLink(link) ? createExternalLink(w.output,link) : createTiddlyLink(w.output,link,false,null,w.isStatic,w.tiddler);
+				addClass(e,"imageLink");
+			}
+			var img = createTiddlyElement(e,"img");
+			if(lookaheadMatch[1])
+				img.align = "left";
+			else if(lookaheadMatch[2])
+				img.align = "right";
+			if(lookaheadMatch[3])
+				img.title = lookaheadMatch[3];
+			img.src = lookaheadMatch[4];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "html",
+	match: "<[Hh][Tt][Mm][Ll]>",
+	lookaheadRegExp: /<[Hh][Tt][Mm][Ll]>((?:.|\n)*?)<\/[Hh][Tt][Mm][Ll]>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"span").innerHTML = lookaheadMatch[1];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "commentByBlock",
+	match: "/%",
+	lookaheadRegExp: /\/%((?:.|\n)*?)%\//mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+	}
+},
+
+{
+	name: "boldByChar",
+	match: "''",
+	termRegExp: /('')/mg,
+	element: "strong",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "italicByChar",
+	match: "//",
+	termRegExp: /(\/\/)/mg,
+	element: "em",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "underlineByChar",
+	match: "__",
+	termRegExp: /(__)/mg,
+	element: "u",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "strikeByChar",
+	match: "--(?!\\s|$)",
+	termRegExp: /((?!\s)--|(?=\n\n))/mg,
+	element: "strike",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "superscriptByChar",
+	match: "\\^\\^",
+	termRegExp: /(\^\^)/mg,
+	element: "sup",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "subscriptByChar",
+	match: "~~",
+	termRegExp: /(~~)/mg,
+	element: "sub",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "monospacedByChar",
+	match: "\\{\\{\\{",
+	lookaheadRegExp: /\{\{\{((?:.|\n)*?)\}\}\}/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"code",null,null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "styleByChar",
+	match: "@@",
+	termRegExp: /(@@)/mg,
+	handler: function(w)
+	{
+		var e = createTiddlyElement(w.output,"span");
+		var styles = config.formatterHelpers.inlineCssHelper(w);
+		if(styles.length == 0)
+			e.className = "marked";
+		else
+			config.formatterHelpers.applyCssHelper(e,styles);
+		w.subWikifyTerm(e,this.termRegExp);
+	}
+},
+
+{
+	name: "lineBreak",
+	match: "\\n|<br ?/?>",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"br");
+	}
+},
+
+{
+	name: "rawText",
+	match: "\\\"{3}|<nowiki>",
+	lookaheadRegExp: /(?:\"{3}|<nowiki>)((?:.|\n)*?)(?:\"{3}|<\/nowiki>)/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"span",null,null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "mdash",
+	match: "--",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"span").innerHTML = "&mdash;";
+	}
+},
+
+{
+	name: "htmlEntitiesEncoding",
+	match: "(?:(?:&#?[a-zA-Z0-9]{2,8};|.)(?:&#?(?:x0*(?:3[0-6][0-9a-fA-F]|1D[c-fC-F][0-9a-fA-F]|20[d-fD-F][0-9a-fA-F]|FE2[0-9a-fA-F])|0*(?:76[89]|7[7-9][0-9]|8[0-7][0-9]|761[6-9]|76[2-7][0-9]|84[0-3][0-9]|844[0-7]|6505[6-9]|6506[0-9]|6507[0-1]));)+|&#?[a-zA-Z0-9]{2,8};)",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"span").innerHTML = w.matchText;
+	}
+},
+
+{
+	name: "customClasses",
+	match: "\\{\\{",
+	termRegExp: /(\}\}\})/mg,
+	lookaheadRegExp: /\{\{[\s]*([\w]+[\s\w]*)[\s]*\{(\n?)/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch) {
+			var e = createTiddlyElement(w.output,lookaheadMatch[2] == "\n" ? "div" : "span",null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			w.subWikifyTerm(e,this.termRegExp);
+		}
+	}
+}
+
+];
+
+//--
+//-- Wikifier
+//--
+
+function getParser(tiddler,format)
+{
+	if(tiddler) {
+		if(!format)
+			format = tiddler.fields["wikiformat"];
+		if(format) {
+			for(var i in config.parsers) {
+				if(format == config.parsers[i].format)
+					return config.parsers[i];
+			}
+		} else {
+			for(var i in config.parsers) {
+				if(tiddler.isTagged(config.parsers[i].formatTag))
+					return config.parsers[i];
+			}
+		}
+	}
+	return formatter;
+}
+
+function wikify(source,output,highlightRegExp,tiddler)
+{
+	if(source && source != "") {
+		var wikifier = new Wikifier(source,getParser(tiddler),highlightRegExp,tiddler);
+		wikifier.subWikifyUnterm(output);
+	}
+}
+
+function wikifyStatic(source,highlightRegExp,tiddler,format)
+{
+	var e = createTiddlyElement(document.body,"div");
+	e.style.display = "none";
+	var html = "";
+	if(source && source != "") {
+		var wikifier = new Wikifier(source,getParser(tiddler,format),highlightRegExp,tiddler);
+		wikifier.isStatic = true;
+		wikifier.subWikifyUnterm(e);
+		html = e.innerHTML;
+		removeNode(e);
+	}
+	return html;
+}
+
+function wikifyPlain(title,theStore,limit)
+{
+	if(!theStore)
+		theStore = store;
+	if(theStore.tiddlerExists(title) || theStore.isShadowTiddler(title)) {
+		return wikifyPlainText(theStore.getTiddlerText(title),limit,tiddler);
+	} else {
+		return "";
+	}
+}
+
+function wikifyPlainText(text,limit,tiddler)
+{
+	if(limit > 0)
+		text = text.substr(0,limit);
+	var wikifier = new Wikifier(text,formatter,null,tiddler);
+	return wikifier.wikifyPlain();
+}
+
+function highlightify(source,output,highlightRegExp,tiddler)
+{
+	if(source && source != "") {
+		var wikifier = new Wikifier(source,formatter,highlightRegExp,tiddler);
+		wikifier.outputText(output,0,source.length);
+	}
+}
+
+function Wikifier(source,formatter,highlightRegExp,tiddler)
+{
+	this.source = source;
+	this.output = null;
+	this.formatter = formatter;
+	this.nextMatch = 0;
+	this.autoLinkWikiWords = tiddler && tiddler.autoLinkWikiWords() == false ? false : true;
+	this.highlightRegExp = highlightRegExp;
+	this.highlightMatch = null;
+	this.isStatic = false;
+	if(highlightRegExp) {
+		highlightRegExp.lastIndex = 0;
+		this.highlightMatch = highlightRegExp.exec(source);
+	}
+	this.tiddler = tiddler;
+}
+
+Wikifier.prototype.wikifyPlain = function()
+{
+	var e = createTiddlyElement(document.body,"div");
+	this.subWikify(e);
+	var text = getPlainText(e);
+	removeNode(e);
+	return text;
+};
+
+Wikifier.prototype.subWikify = function(output,terminator)
+{
+	if(terminator)
+		this.subWikifyTerm(output,new RegExp("(" + terminator + ")","mg"));
+	else
+		this.subWikifyUnterm(output);
+};
+
+Wikifier.prototype.subWikifyUnterm = function(output)
+{
+	// subWikify() can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+	while(formatterMatch) {
+		// Output any text before the match
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		// Set the match parameters for the handler
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		for(var t=1; t<formatterMatch.length; t++) {
+			if(formatterMatch[t]) {
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+			}
+		}
+		formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+	}
+	if(this.nextMatch < this.source.length) {
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+	}
+	this.output = oldOutput;
+};
+
+Wikifier.prototype.subWikifyTerm = function(output,terminatorRegExp)
+{
+	// subWikify() can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	// Get the first matches for the formatter and terminator RegExps
+	terminatorRegExp.lastIndex = this.nextMatch;
+	var terminatorMatch = terminatorRegExp.exec(this.source);
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+	while(terminatorMatch || formatterMatch) {
+		if(terminatorMatch && (!formatterMatch || terminatorMatch.index <= formatterMatch.index)) {
+			if(terminatorMatch.index > this.nextMatch)
+				this.outputText(this.output,this.nextMatch,terminatorMatch.index);
+			this.matchText = terminatorMatch[1];
+			this.matchLength = terminatorMatch[1].length;
+			this.matchStart = terminatorMatch.index;
+			this.nextMatch = this.matchStart + this.matchLength;
+			this.output = oldOutput;
+			return;
+		}
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		for(var t=1; t<formatterMatch.length; t++) {
+			if(formatterMatch[t]) {
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+			}
+		}
+		terminatorRegExp.lastIndex = this.nextMatch;
+		terminatorMatch = terminatorRegExp.exec(this.source);
+		formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+	}
+	if(this.nextMatch < this.source.length) {
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+	}
+	this.output = oldOutput;
+};
+
+Wikifier.prototype.outputText = function(place,startPos,endPos)
+{
+	while(this.highlightMatch && (this.highlightRegExp.lastIndex > startPos) && (this.highlightMatch.index < endPos) && (startPos < endPos)) {
+		if(this.highlightMatch.index > startPos) {
+			createTiddlyText(place,this.source.substring(startPos,this.highlightMatch.index));
+			startPos = this.highlightMatch.index;
+		}
+		var highlightEnd = Math.min(this.highlightRegExp.lastIndex,endPos);
+		var theHighlight = createTiddlyElement(place,"span",null,"highlight",this.source.substring(startPos,highlightEnd));
+		startPos = highlightEnd;
+		if(startPos >= this.highlightRegExp.lastIndex)
+			this.highlightMatch = this.highlightRegExp.exec(this.source);
+	}
+	if(startPos < endPos) {
+		createTiddlyText(place,this.source.substring(startPos,endPos));
+	}
+};
+
+//--
+//-- Macro definitions
+//--
+
+config.macros.today.handler = function(place,macroName,params)
+{
+	var now = new Date();
+	var text;
+	if(params[0])
+		text = now.formatString(params[0].trim());
+	else
+		text = now.toLocaleString();
+	createTiddlyElement(place,"span",null,null,text);
+};
+
+config.macros.version.handler = function(place)
+{
+	createTiddlyElement(place,"span",null,null,version.major + "." + version.minor + "." + version.revision + (version.beta ? " (beta " + version.beta + ")" : ""));
+};
+
+config.macros.list.handler = function(place,macroName,params)
+{
+	var type = params[0] ? params[0] : "all";
+	var list = document.createElement("ul");
+	place.appendChild(list);
+	if(this[type].prompt)
+		createTiddlyElement(list,"li",null,"listTitle",this[type].prompt);
+	var results;
+	if(this[type].handler)
+		results = this[type].handler(params);
+	for(var t = 0; t < results.length; t++) {
+		var li = document.createElement("li");
+		list.appendChild(li);
+		createTiddlyLink(li,typeof results[t] == "string" ? results[t] : results[t].title,true);
+	}
+};
+
+config.macros.list.all.handler = function(params)
+{
+	return store.reverseLookup("tags","excludeLists",false,"title");
+};
+
+config.macros.list.missing.handler = function(params)
+{
+	return store.getMissingLinks();
+};
+
+config.macros.list.orphans.handler = function(params)
+{
+	return store.getOrphans();
+};
+
+config.macros.list.shadowed.handler = function(params)
+{
+	return store.getShadowed();
+};
+
+config.macros.list.touched.handler = function(params)
+{
+	return store.getTouched();
+};
+
+config.macros.allTags.handler = function(place,macroName,params)
+{
+	var tags = store.getTags(params[0]);
+	var ul = createTiddlyElement(place,"ul");
+	if(tags.length == 0)
+		createTiddlyElement(ul,"li",null,"listTitle",this.noTags);
+	for(var t=0; t<tags.length; t++) {
+		var title = tags[t][0];
+		var info = getTiddlyLinkInfo(title);
+		var li =createTiddlyElement(ul,"li");
+		var btn = createTiddlyButton(li,title + " (" + tags[t][1] + ")",this.tooltip.format([title]),onClickTag,info.classes);
+		btn.setAttribute("tag",title);
+		btn.setAttribute("refresh","link");
+		btn.setAttribute("tiddlyLink",title);
+	}
+};
+
+config.macros.timeline.handler = function(place,macroName,params)
+{
+	var field = params[0] ? params[0] : "modified";
+	var tiddlers = store.reverseLookup("tags","excludeLists",false,field);
+	var lastDay = "";
+	var last = params[1] ? tiddlers.length-Math.min(tiddlers.length,parseInt(params[1])) : 0;
+	for(var t=tiddlers.length-1; t>=last; t--) {
+		var tiddler = tiddlers[t];
+		var theDay = tiddler[field].convertToLocalYYYYMMDDHHMM().substr(0,8);
+		if(theDay != lastDay) {
+			var theDateList = document.createElement("ul");
+			place.appendChild(theDateList);
+			createTiddlyElement(theDateList,"li",null,"listTitle",tiddler[field].formatString(this.dateFormat));
+			lastDay = theDay;
+		}
+		var theDateListItem = createTiddlyElement(theDateList,"li",null,"listLink");
+		theDateListItem.appendChild(createTiddlyLink(place,tiddler.title,true));
+	}
+};
+
+config.macros.search.handler = function(place,macroName,params)
+{
+	var searchTimeout = null;
+	var btn = createTiddlyButton(place,this.label,this.prompt,this.onClick);
+	var txt = createTiddlyElement(place,"input",null,"txtOptionInput");
+	if(params[0])
+		txt.value = params[0];
+	txt.onkeyup = this.onKeyPress;
+	txt.onfocus = this.onFocus;
+	txt.setAttribute("size",this.sizeTextbox);
+	txt.setAttribute("accessKey",this.accessKey);
+	txt.setAttribute("autocomplete","off");
+	txt.setAttribute("lastSearchText","");
+	if(config.browser.isSafari) {
+		txt.setAttribute("type","search");
+		txt.setAttribute("results","5");
+	} else {
+		txt.setAttribute("type","text");
+	}
+};
+
+// Global because there's only ever one outstanding incremental search timer
+config.macros.search.timeout = null;
+
+config.macros.search.doSearch = function(txt)
+{
+	if(txt.value.length > 0) {
+		story.search(txt.value,config.options.chkCaseSensitiveSearch,config.options.chkRegExpSearch);
+		txt.setAttribute("lastSearchText",txt.value);
+	}
+};
+
+config.macros.search.onClick = function(e)
+{
+	config.macros.search.doSearch(this.nextSibling);
+	return false;
+};
+
+config.macros.search.onKeyPress = function(e)
+{
+	if(!e) var e = window.event;
+	switch(e.keyCode) {
+		case 13: // Ctrl-Enter
+		case 10: // Ctrl-Enter on IE PC
+			config.macros.search.doSearch(this);
+			break;
+		case 27: // Escape
+			this.value = "";
+			clearMessage();
+			break;
+	}
+	if(this.value.length > 2) {
+		if(this.value != this.getAttribute("lastSearchText")) {
+			if(config.macros.search.timeout)
+				clearTimeout(config.macros.search.timeout);
+			var txt = this;
+			config.macros.search.timeout = setTimeout(function() {config.macros.search.doSearch(txt);},500);
+		}
+	} else {
+		if(config.macros.search.timeout)
+			clearTimeout(config.macros.search.timeout);
+	}
+};
+
+config.macros.search.onFocus = function(e)
+{
+	this.select();
+};
+
+config.macros.tiddler.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("name",null,true,false,true);
+	var names = params[0]["name"];
+	var tiddlerName = names[0];
+	var className = names[1] ? names[1] : null;
+	var args = params[0]["with"];
+	var wrapper = createTiddlyElement(place,"span",null,className);
+	if(!args) {
+		wrapper.setAttribute("refresh","content");
+		wrapper.setAttribute("tiddler",tiddlerName);
+	}
+	var text = store.getTiddlerText(tiddlerName);
+	if(text) {
+		var stack = config.macros.tiddler.tiddlerStack;
+		if(stack.indexOf(tiddlerName) !== -1)
+			return;
+		stack.push(tiddlerName);
+		try {
+			var n = args ? Math.min(args.length,9) : 0;
+			for(var i=0; i<n; i++) {
+				var placeholderRE = new RegExp("\\$" + (i + 1),"mg");
+				text = text.replace(placeholderRE,args[i]);
+			}
+			config.macros.tiddler.renderText(wrapper,text,tiddlerName,params);
+		} finally {
+			stack.pop();
+		}
+	}
+};
+
+config.macros.tiddler.renderText = function(place,text,tiddlerName,params) 
+{
+	wikify(text,place,null,store.getTiddler(tiddlerName));
+};
+
+config.macros.tiddler.tiddlerStack = [];
+
+config.macros.tag.handler = function(place,macroName,params)
+{
+	createTagButton(place,params[0]);
+};
+
+config.macros.tags.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var theList = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title && store.tiddlerExists(title))
+		tiddler = store.getTiddler(title);
+	var sep = getParam(params,"sep"," ");
+	var lingo = config.views.wikified.tag;
+	var prompt = tiddler.tags.length == 0 ? lingo.labelNoTags : lingo.labelTags;
+	createTiddlyElement(theList,"li",null,"listTitle",prompt.format([tiddler.title]));
+	for(var t=0; t<tiddler.tags.length; t++) {
+		createTagButton(createTiddlyElement(theList,"li"),tiddler.tags[t],tiddler.title);
+		if(t<tiddler.tags.length-1)
+			createTiddlyText(theList,sep);
+	}
+};
+
+config.macros.tagging.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var theList = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title == "" && tiddler instanceof Tiddler)
+		title = tiddler.title;
+	var sep = getParam(params,"sep"," ");
+	theList.setAttribute("title",this.tooltip.format([title]));
+	var tagged = store.getTaggedTiddlers(title);
+	var prompt = tagged.length == 0 ? this.labelNotTag : this.label;
+	createTiddlyElement(theList,"li",null,"listTitle",prompt.format([title,tagged.length]));
+	for(var t=0; t<tagged.length; t++) {
+		createTiddlyLink(createTiddlyElement(theList,"li"),tagged[t].title,true);
+		if(t<tagged.length-1)
+			createTiddlyText(theList,sep);
+	}
+};
+
+config.macros.closeAll.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.closeAll.onClick = function(e)
+{
+	story.closeAllTiddlers();
+	return false;
+};
+
+config.macros.permaview.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.permaview.onClick = function(e)
+{
+	story.permaView();
+	return false;
+};
+
+config.macros.saveChanges.handler = function(place)
+{
+	if(!readOnly)
+		createTiddlyButton(place,this.label,this.prompt,this.onClick,null,null,this.accessKey);
+};
+
+config.macros.saveChanges.onClick = function(e)
+{
+	saveChanges();
+	return false;
+};
+
+config.macros.slider.onClickSlider = function(e)
+{
+	if(!e) var e = window.event;
+	var n = this.nextSibling;
+	var cookie = n.getAttribute("cookie");
+	var isOpen = n.style.display != "none";
+	if(config.options.chkAnimate && anim && typeof Slider == "function")
+		anim.startAnimating(new Slider(n,!isOpen,null,"none"));
+	else
+		n.style.display = isOpen ? "none" : "block";
+	config.options[cookie] = !isOpen;
+	saveOptionCookie(cookie);
+	return false;
+};
+
+config.macros.slider.createSlider = function(place,cookie,title,tooltip)
+{
+	var cookie = cookie ? cookie : "";
+	var btn = createTiddlyButton(place,title,tooltip,this.onClickSlider);
+	var panel = createTiddlyElement(null,"div",null,"sliderPanel");
+	panel.setAttribute("cookie",cookie);
+	panel.style.display = config.options[cookie] ? "block" : "none";
+	place.appendChild(panel);
+	return panel;
+};
+
+config.macros.slider.handler = function(place,macroName,params)
+{
+	var panel = this.createSlider(place,params[0],params[2],params[3]);
+	var text = store.getTiddlerText(params[1]);
+	panel.setAttribute("refresh","content");
+	panel.setAttribute("tiddler",params[1]);
+	if(text)
+		wikify(text,panel,null,store.getTiddler(params[1]));
+};
+
+config.macros.option.genericCreate = function(place,type,opt,className,desc)
+{
+	var typeInfo = config.macros.option.types[type];
+	var c = document.createElement(typeInfo.elementType);
+	if(typeInfo.typeValue)
+		c.setAttribute("type",typeInfo.typeValue);
+	c[typeInfo.eventName] = typeInfo.onChange;
+	c.setAttribute("option",opt);
+	if(className)
+		c.className = className;
+	else
+		c.className = typeInfo.className;
+	if(config.optionsDesc[opt])
+		c.setAttribute("title",config.optionsDesc[opt]);
+	place.appendChild(c);
+	if(desc != "no")
+		createTiddlyText(place,config.optionsDesc[opt] ? config.optionsDesc[opt] : opt);
+	c[typeInfo.valueField] = config.options[opt];
+	return c;
+};
+
+config.macros.option.genericOnChange = function(e)
+{
+	var opt = this.getAttribute("option");
+	if(opt) {
+		var optType = opt.substr(0,3);
+		var handler = config.macros.option.types[optType];
+		if (handler.elementType && handler.valueField)
+			config.macros.option.propagateOption(opt,handler.valueField,this[handler.valueField],handler.elementType);
+		}
+	return true;
+};
+
+config.macros.option.types = {
+	'txt': {
+		elementType: "input",
+		valueField: "value",
+		eventName: "onkeyup",
+		className: "txtOptionInput",
+		create: config.macros.option.genericCreate,
+		onChange: config.macros.option.genericOnChange
+	},
+	'chk': {
+		elementType: "input",
+		valueField: "checked",
+		eventName: "onclick",
+		className: "chkOptionInput",
+		typeValue: "checkbox",
+		create: config.macros.option.genericCreate,
+		onChange: config.macros.option.genericOnChange
+	}
+};
+
+config.macros.option.propagateOption = function(opt,valueField,value,elementType)
+{
+	config.options[opt] = value;
+	saveOptionCookie(opt);
+	var nodes = document.getElementsByTagName(elementType);
+	for(var t=0; t<nodes.length; t++) {
+		var optNode = nodes[t].getAttribute("option");
+		if(opt == optNode)
+			nodes[t][valueField] = value;
+		}
+};
+
+config.macros.option.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var opt = (params[1] && params[1].name == "anon") ? params[1].value : getParam(params,"name",null);
+	var className = (params[2] && params[2].name == "anon") ? params[2].value : getParam(params,"class",null);
+	var desc = getParam(params,"desc","no");
+	var type = opt.substr(0,3);
+	var h = config.macros.option.types[type];
+	if (h && h.create)
+		h.create(place,type,opt,className,desc);
+};
+
+config.macros.options.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var showUnknown = getParam(params,"showUnknown","no");
+	var wizard = new Wizard();
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var chkUnknown = wizard.getElement("chkUnknown");
+	chkUnknown.checked = showUnknown == "yes";
+	chkUnknown.onchange = this.onChangeUnknown;
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	wizard.setValue("listWrapper",listWrapper);
+	this.refreshOptions(listWrapper,showUnknown == "yes");
+};
+
+config.macros.options.refreshOptions = function(listWrapper,showUnknown)
+{	
+	var opts = [];
+	for(var n in config.options) {
+		var opt = {};
+		opt.option = "";
+		opt.name = n;
+		opt.lowlight = !config.optionsDesc[n];
+		opt.description = opt.lowlight ? this.unknownDescription : config.optionsDesc[n];
+		if(!opt.lowlight || showUnknown)
+			opts.push(opt);
+	}
+	opts.sort(function(a,b) {return a.name.substr(3) < b.name.substr(3) ? -1 : (a.name.substr(3) == b.name.substr(3) ? 0 : +1);});
+	var listview = ListView.create(listWrapper,opts,this.listViewTemplate);
+	for(n=0; n<opts.length; n++) {
+		var type = opts[n].name.substr(0,3);
+		var h = config.macros.option.types[type];
+		if (h && h.create) {
+			h.create(opts[n].colElements['option'],type,opts[n].name,null,"no");
+		}
+	}
+};
+
+config.macros.options.onChangeUnknown = function(e)
+{
+	var wizard = new Wizard(this);
+	var listWrapper = wizard.getValue("listWrapper");
+	removeChildren(listWrapper);
+	config.macros.options.refreshOptions(listWrapper,this.checked);
+	return false;
+};
+
+config.macros.newTiddler.createNewTiddlerButton = function(place,title,params,label,prompt,accessKey,newFocus,isJournal)
+{
+	var tags = [];
+	for(var t=1; t<params.length; t++) {
+		if((params[t].name == "anon" && t != 1) || (params[t].name == "tag"))
+			tags.push(params[t].value);
+	}
+	label = getParam(params,"label",label);
+	prompt = getParam(params,"prompt",prompt);
+	accessKey = getParam(params,"accessKey",accessKey);
+	newFocus = getParam(params,"focus",newFocus);
+	var customFields = getParam(params,"fields","");
+	if(!customFields && !store.isShadowTiddler(title))
+		customFields = String.encodeHashMap(config.defaultCustomFields);
+	var btn = createTiddlyButton(place,label,prompt,this.onClickNewTiddler,null,null,accessKey);
+	btn.setAttribute("newTitle",title);
+	btn.setAttribute("isJournal",isJournal ? "true" : "false");
+	if(tags.length > 0)
+		btn.setAttribute("params",tags.join("|"));
+	btn.setAttribute("newFocus",newFocus);
+	btn.setAttribute("newTemplate",getParam(params,"template",DEFAULT_EDIT_TEMPLATE));
+	if(customFields !== "")
+		btn.setAttribute("customFields",customFields);
+	var text = getParam(params,"text");
+	if(text !== undefined) 
+		btn.setAttribute("newText",text);
+	return btn;
+};
+
+config.macros.newTiddler.onClickNewTiddler = function()
+{
+	var title = this.getAttribute("newTitle");
+	if(this.getAttribute("isJournal") == "true") {
+		var now = new Date();
+		title = now.formatString(title.trim());
+	}
+	var params = this.getAttribute("params");
+	var tags = params ? params.split("|") : [];
+	var focus = this.getAttribute("newFocus");
+	var template = this.getAttribute("newTemplate");
+	var customFields = this.getAttribute("customFields");
+	story.displayTiddler(null,title,template,false,null,null);
+	var tiddlerElem = document.getElementById(story.idPrefix + title);
+	story.addCustomFields(tiddlerElem,customFields);
+	var text = this.getAttribute("newText");
+	if(typeof text == "string")
+		story.getTiddlerField(title,"text").value = text.format([title]);
+	for(var t=0;t<tags.length;t++)
+		story.setTiddlerTag(title,tags[t],+1);
+	story.focusTiddler(title,focus);
+	return false;
+};
+
+config.macros.newTiddler.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!readOnly) {
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : this.title;
+		title = getParam(params,"title",title);
+		this.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"title",false);
+	}
+};
+
+config.macros.newJournal.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!readOnly) {
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : "";
+		title = getParam(params,"title",title);
+		config.macros.newTiddler.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"text",true);
+	}
+};
+
+config.macros.sparkline.handler = function(place,macroName,params)
+{
+	var data = [];
+	var min = 0;
+	var max = 0;
+	for(var t=0; t<params.length; t++) {
+		var v = parseInt(params[t]);
+		if(v < min)
+			min = v;
+		if(v > max)
+			max = v;
+		data.push(v);
+	}
+	if(data.length < 1)
+		return;
+	var box = createTiddlyElement(place,"span",null,"sparkline",String.fromCharCode(160));
+	box.title = data.join(",");
+	var w = box.offsetWidth;
+	var h = box.offsetHeight;
+	box.style.paddingRight = (data.length * 2 - w) + "px";
+	box.style.position = "relative";
+	for(var d=0; d<data.length; d++) {
+		var tick = document.createElement("img");
+		tick.border = 0;
+		tick.className = "sparktick";
+		tick.style.position = "absolute";
+		tick.src = "data:image/gif,GIF89a%01%00%01%00%91%FF%00%FF%FF%FF%00%00%00%C0%C0%C0%00%00%00!%F9%04%01%00%00%02%00%2C%00%00%00%00%01%00%01%00%40%02%02T%01%00%3B";
+		tick.style.left = d*2 + "px";
+		tick.style.width = "2px";
+		var v = Math.floor(((data[d] - min)/(max-min)) * h);
+		tick.style.top = (h-v) + "px";
+		tick.style.height = v + "px";
+		box.appendChild(tick);
+	}
+};
+
+config.macros.tabs.handler = function(place,macroName,params)
+{
+	var cookie = params[0];
+	var numTabs = (params.length-1)/3;
+	var wrapper = createTiddlyElement(null,"div",null,cookie);
+	var tabset = createTiddlyElement(wrapper,"div",null,"tabset");
+	tabset.setAttribute("cookie",cookie);
+	var validTab = false;
+	for(var t=0; t<numTabs; t++) {
+		var label = params[t*3+1];
+		var prompt = params[t*3+2];
+		var content = params[t*3+3];
+		var tab = createTiddlyButton(tabset,label,prompt,this.onClickTab,"tab tabUnselected");
+		tab.setAttribute("tab",label);
+		tab.setAttribute("content",content);
+		tab.title = prompt;
+		if(config.options[cookie] == label)
+			validTab = true;
+	}
+	if(!validTab)
+		config.options[cookie] = params[1];
+	place.appendChild(wrapper);
+	this.switchTab(tabset,config.options[cookie]);
+};
+
+config.macros.tabs.onClickTab = function(e)
+{
+	config.macros.tabs.switchTab(this.parentNode,this.getAttribute("tab"));
+	return false;
+};
+
+config.macros.tabs.switchTab = function(tabset,tab)
+{
+	var cookie = tabset.getAttribute("cookie");
+	var theTab = null;
+	var nodes = tabset.childNodes;
+	for(var t=0; t<nodes.length; t++) {
+		if(nodes[t].getAttribute && nodes[t].getAttribute("tab") == tab) {
+			theTab = nodes[t];
+			theTab.className = "tab tabSelected";
+		} else {
+			nodes[t].className = "tab tabUnselected";
+		}
+	}
+	if(theTab) {
+		if(tabset.nextSibling && tabset.nextSibling.className == "tabContents")
+			removeNode(tabset.nextSibling);
+		var tabContent = createTiddlyElement(null,"div",null,"tabContents");
+		tabset.parentNode.insertBefore(tabContent,tabset.nextSibling);
+		var contentTitle = theTab.getAttribute("content");
+		wikify(store.getTiddlerText(contentTitle),tabContent,null,store.getTiddler(contentTitle));
+		if(cookie) {
+			config.options[cookie] = tab;
+			saveOptionCookie(cookie);
+		}
+	}
+};
+
+// <<gradient [[tiddler name]] vert|horiz rgb rgb rgb rgb... >>
+config.macros.gradient.handler = function(place,macroName,params,wikifier)
+{
+	var terminator = ">>";
+	var panel;
+	if(wikifier)
+		panel = createTiddlyElement(place,"div",null,"gradient");
+	else
+		panel = place;
+	panel.style.position = "relative";
+	panel.style.overflow = "hidden";
+	panel.style.zIndex = "0";
+	var t;
+	if(wikifier) {
+		var styles = config.formatterHelpers.inlineCssHelper(wikifier);
+		config.formatterHelpers.applyCssHelper(panel,styles);
+	}
+	var colours = [];
+	for(t=1; t<params.length; t++) {
+		var c = new RGB(params[t]);
+		if(c)
+			colours.push(c);
+	}
+	drawGradient(panel,params[0] != "vert",colours);
+	if(wikifier)
+		wikifier.subWikify(panel,terminator);
+	if(document.all) {
+		panel.style.height = "100%";
+		panel.style.width = "100%";
+	}
+};
+
+config.macros.message.handler = function(place,macroName,params)
+{
+	if(params[0]) {
+		var m = config;
+		var p = params[0].split(".");
+		for(var t=0; t<p.length; t++) {
+			if(p[t] in m)
+				m = m[p[t]];
+			else
+				break;
+		}
+		createTiddlyText(place,m.toString().format(params.splice(1)));
+	}
+};
+
+config.macros.view.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if((tiddler instanceof Tiddler) && params[0]) {
+		var value = store.getValue(tiddler,params[0]);
+		if(value != undefined) {
+			switch(params[1]) {
+				case undefined:
+					highlightify(value,place,highlightHack,tiddler);
+					break;
+				case "link":
+					createTiddlyLink(place,value,true);
+					break;
+				case "wikified":
+					wikify(value,place,highlightHack,tiddler);
+					break;
+				case "date":
+					value = Date.convertFromYYYYMMDDHHMM(value);
+					createTiddlyText(place,value.formatString(params[2] ? params[2] : config.views.wikified.dateFormat));
+					break;
+			}
+		}
+	}
+};
+
+config.macros.edit.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var field = params[0];
+	var rows = params[1];
+	if((tiddler instanceof Tiddler) && field) {
+		story.setDirty(tiddler.title,true);
+		if(field != "text" && !rows) {
+			var e = createTiddlyElement(null,"input");
+			if(tiddler.isReadOnly())
+				e.setAttribute("readOnly","readOnly");
+			e.setAttribute("edit",field);
+			e.setAttribute("type","text");
+			var v = store.getValue(tiddler,field);
+			if(!v) 
+				v = "";
+			e.value = v;
+			e.setAttribute("size","40");
+			e.setAttribute("autocomplete","off");
+			place.appendChild(e);
+		} else {
+			var wrapper1 = createTiddlyElement(null,"fieldset",null,"fieldsetFix");
+			var wrapper2 = createTiddlyElement(wrapper1,"div");
+			var e = createTiddlyElement(wrapper2,"textarea");
+			if(tiddler.isReadOnly())
+				e.setAttribute("readOnly","readOnly");
+			var v = store.getValue(tiddler,field);
+			if(!v) 
+				v = "";
+			e.value = v;
+			var rows = rows ? rows : 10;
+			var lines = v.match(/\n/mg);
+			var maxLines = Math.max(parseInt(config.options.txtMaxEditRows),5);
+			if(lines != null && lines.length > rows)
+				rows = lines.length + 5;
+			rows = Math.min(rows,maxLines);
+			e.setAttribute("rows",rows);
+			e.setAttribute("edit",field);
+			place.appendChild(wrapper1);
+		}
+	}
+};
+
+config.macros.tagChooser.onClick = function(e)
+{
+	if(!e) var e = window.event;
+	var lingo = config.views.editor.tagChooser;
+	var popup = Popup.create(this);
+	var tags = store.getTags();
+	if(tags.length == 0)
+		createTiddlyText(createTiddlyElement(popup,"li"),lingo.popupNone);
+	for(var t=0; t<tags.length; t++) {
+		var theTag = createTiddlyButton(createTiddlyElement(popup,"li"),tags[t][0],lingo.tagTooltip.format([tags[t][0]]),config.macros.tagChooser.onTagClick);
+		theTag.setAttribute("tag",tags[t][0]);
+		theTag.setAttribute("tiddler",this.getAttribute("tiddler"));
+	}
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+};
+
+config.macros.tagChooser.onTagClick = function(e)
+{
+	if(!e) var e = window.event;
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(!readOnly)
+		story.setTiddlerTag(title,tag,0);
+	return false;
+};
+
+config.macros.tagChooser.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(tiddler instanceof Tiddler) {
+		var title = tiddler.title;
+		var lingo = config.views.editor.tagChooser;
+		var btn = createTiddlyButton(place,lingo.text,lingo.tooltip,this.onClick);
+		btn.setAttribute("tiddler",title);
+	}
+};
+
+// Create a toolbar command button
+config.macros.toolbar.createCommand = function(place,commandName,tiddler,theClass)
+{
+	if(typeof commandName != "string") {
+		var c = null;
+		for(var t in config.commands) {
+			if(config.commands[t] == commandName)
+				c = t;
+		}
+		commandName = c;
+	}
+	if((tiddler instanceof Tiddler) && (typeof commandName == "string")) {
+		var command = config.commands[commandName];
+		if(command.isEnabled ? command.isEnabled(tiddler) : this.isCommandEnabled(command,tiddler)) {
+			var text = command.getText ? command.getText(tiddler) : this.getCommandText(command,tiddler);
+			var tooltip = command.getTooltip ? command.getTooltip(tiddler) : this.getCommandTooltip(command,tiddler);
+			var cmd;
+			switch(command.type) {
+				case "popup":
+					cmd = this.onClickPopup;
+					break;
+				case "command":
+				default:
+					cmd = this.onClickCommand;
+					break;
+			}
+			var btn = createTiddlyButton(null,text,tooltip,cmd);
+			btn.setAttribute("commandName",commandName);
+			btn.setAttribute("tiddler",tiddler.title);
+			if(theClass)
+				addClass(btn,theClass);
+			place.appendChild(btn);
+		}
+	}
+};
+
+config.macros.toolbar.isCommandEnabled = function(command,tiddler)
+{
+	var title = tiddler.title;
+	var ro = tiddler.isReadOnly();
+	var shadow = store.isShadowTiddler(title) && !store.tiddlerExists(title);
+	return (!ro || (ro && !command.hideReadOnly)) && !(shadow && command.hideShadow);
+};
+
+config.macros.toolbar.getCommandText = function(command,tiddler)
+{
+	return tiddler.isReadOnly() && command.readOnlyText ? command.readOnlyText : command.text;
+};
+
+config.macros.toolbar.getCommandTooltip = function(command,tiddler)
+{
+	return tiddler.isReadOnly() && command.readOnlyTooltip ? command.readOnlyTooltip : command.tooltip;
+};
+
+config.macros.toolbar.onClickCommand = function(e)
+{
+	if(!e) var e = window.event;
+	e.cancelBubble = true;
+	if (e.stopPropagation) e.stopPropagation();
+	var command = config.commands[this.getAttribute("commandName")];
+	return command.handler(e,this,this.getAttribute("tiddler"));
+};
+
+config.macros.toolbar.onClickPopup = function(e)
+{
+	if(!e) var e = window.event;
+	e.cancelBubble = true;
+	if (e.stopPropagation) e.stopPropagation();
+	var popup = Popup.create(this);
+	var command = config.commands[this.getAttribute("commandName")];
+	var title = this.getAttribute("tiddler");
+	var tiddler = store.fetchTiddler(title);
+	popup.setAttribute("tiddler",title);
+	command.handlePopup(popup,title);
+	Popup.show();
+	return false;
+};
+
+// Invoke the first command encountered from a given place that is tagged with a specified class
+config.macros.toolbar.invokeCommand = function(place,theClass,event)
+{
+	var children = place.getElementsByTagName("a");
+	for(var t=0; t<children.length; t++) {
+		var c = children[t];
+		if(hasClass(c,theClass) && c.getAttribute && c.getAttribute("commandName")) {
+			if(c.onclick instanceof Function)
+				c.onclick.call(c,event);
+			break;
+		}
+	}
+};
+
+config.macros.toolbar.onClickMore = function(e)
+{
+	var e = this.nextSibling;
+	e.style.display = "inline";
+	removeNode(this);
+	return false;
+};
+
+config.macros.toolbar.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	for(var t=0; t<params.length; t++) {
+		var c = params[t];
+		switch(c) {
+			case '>':
+				var btn = createTiddlyButton(place,this.moreLabel,this.morePrompt,config.macros.toolbar.onClickMore);
+				addClass(btn,"moreCommand");
+				var e = createTiddlyElement(place,"span",null,"moreCommand");
+				e.style.display = "none";
+				place = e;
+				break;
+			default:
+				var theClass = "";
+				switch(c.substr(0,1)) {
+					case "+":
+						theClass = "defaultCommand";
+						c = c.substr(1);
+						break;
+					case "-":
+						theClass = "cancelCommand";
+						c = c.substr(1);
+						break;
+				}
+				if(c in config.commands)
+					this.createCommand(place,c,tiddler,theClass);
+				break;
+		}
+	}
+};
+
+config.macros.refreshDisplay.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.refreshDisplay.onClick = function(e)
+{
+	refreshAll();
+	return false;
+};
+
+config.macros.annotations.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var title = tiddler ? tiddler.title : null;
+	var a = title ? config.annotations[title] : null;
+	if(!tiddler || !title || !a)
+		return;
+	var text = a.format([title]);
+	wikify(text,createTiddlyElement(place,"div",null,"annotation"),null,tiddler);
+};
+
+//--
+//-- Menu and toolbar commands
+//--
+
+config.commands.closeTiddler.handler = function(event,src,title)
+{
+	story.closeTiddler(title,true);
+	return false;
+};
+
+config.commands.closeOthers.handler = function(event,src,title)
+{
+	story.closeAllTiddlers(title);
+	return false;
+};
+
+config.commands.editTiddler.handler = function(event,src,title)
+{
+	clearMessage();
+	var tiddlerElem = document.getElementById(story.idPrefix + title);
+	var fields = tiddlerElem.getAttribute("tiddlyFields");
+	story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE,false,null,fields);
+	story.focusTiddler(title,"text");
+	return false;
+};
+
+config.commands.saveTiddler.handler = function(event,src,title)
+{
+	var newTitle = story.saveTiddler(title,event.shiftKey);
+	if(newTitle)
+		story.displayTiddler(null,newTitle);
+	return false;
+};
+
+config.commands.cancelTiddler.handler = function(event,src,title)
+{
+	if(story.hasChanges(title) && !readOnly) {
+		if(!confirm(this.warning.format([title])))
+			return false;
+	}
+	story.setDirty(title,false);
+	story.displayTiddler(null,title);
+	return false;
+};
+
+config.commands.deleteTiddler.handler = function(event,src,title)
+{
+	var deleteIt = true;
+	if (config.options.chkConfirmDelete)
+		deleteIt = confirm(this.warning.format([title]));
+	if (deleteIt) {
+		store.removeTiddler(title);
+		story.closeTiddler(title,true);
+		autoSaveChanges();
+	}
+	return false;
+};
+
+config.commands.permalink.handler = function(event,src,title)
+{
+	var t = encodeURIComponent(String.encodeTiddlyLink(title));
+	if(window.location.hash != t)
+		window.location.hash = t;
+	return false;
+};
+
+config.commands.references.handlePopup = function(popup,title)
+{
+	var references = store.getReferringTiddlers(title);
+	var c = false;
+	for(var r=0; r<references.length; r++) {
+		if(references[r].title != title && !references[r].isTagged("excludeLists")) {
+			createTiddlyLink(createTiddlyElement(popup,"li"),references[r].title,true);
+			c = true;
+		}
+	}
+	if(!c)
+		createTiddlyText(createTiddlyElement(popup,"li",null,"disabled"),this.popupNone);
+};
+
+config.commands.jump.handlePopup = function(popup,title)
+{
+	story.forEachTiddler(function(title,element) {
+		createTiddlyLink(createTiddlyElement(popup,"li"),title,true,null,false,null,true);
+		});
+};
+
+config.commands.syncing.handlePopup = function(popup,title)
+{
+	var tiddler = store.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	var serverType = tiddler.getServerType();
+	var serverHost = tiddler.fields['server.host'];
+	var serverWorkspace = tiddler.fields['server.workspace'];
+	if(!serverWorkspace)
+		serverWorkspace = "";
+	if(serverType) {
+		var e = createTiddlyElement(popup,"li",null,"popupMessage");
+		e.innerHTML = config.commands.syncing.currentlySyncing.format([serverType,serverHost,serverWorkspace]);
+	} else {
+		createTiddlyElement(popup,"li",null,"popupMessage",config.commands.syncing.notCurrentlySyncing);
+	}
+	if(serverType) {
+		createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+		var btn = createTiddlyButton(createTiddlyElement(popup,"li"),this.captionUnSync,null,config.commands.syncing.onChooseServer);
+		btn.setAttribute("tiddler",title);
+		btn.setAttribute("server.type","");
+	}
+	createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+	createTiddlyElement(popup,"li",null,"popupMessage",config.commands.syncing.chooseServer);
+	var feeds = store.getTaggedTiddlers("systemServer","title");
+	for(var t=0; t<feeds.length; t++) {
+		var f = feeds[t];
+		var feedServerType = store.getTiddlerSlice(f.title,"Type");
+		if(!feedServerType)
+			feedServerType = "file";
+		var feedServerHost = store.getTiddlerSlice(f.title,"URL");
+		if(!feedServerHost)
+			feedServerHost = "";
+		var feedServerWorkspace = store.getTiddlerSlice(f.title,"Workspace");
+		if(!feedServerWorkspace)
+			feedServerWorkspace = "";
+		var caption = f.title;
+		if(serverType == feedServerType && serverHost == feedServerHost && serverWorkspace == feedServerWorkspace) {
+			caption = config.commands.syncing.currServerMarker + caption;
+		} else {
+			caption = config.commands.syncing.notCurrServerMarker + caption;
+		}
+		btn = createTiddlyButton(createTiddlyElement(popup,"li"),caption,null,config.commands.syncing.onChooseServer);
+		btn.setAttribute("tiddler",title);
+		btn.setAttribute("server.type",feedServerType);
+		btn.setAttribute("server.host",feedServerHost);
+		btn.setAttribute("server.workspace",feedServerWorkspace);
+	}
+};
+
+config.commands.syncing.onChooseServer = function(e)
+{
+	var tiddler = this.getAttribute("tiddler");
+	var serverType = this.getAttribute("server.type");
+	if(serverType) {
+		store.addTiddlerFields(tiddler,{
+			'server.type': serverType,
+			'server.host': this.getAttribute("server.host"),
+			'server.workspace': this.getAttribute("server.workspace")
+			});
+	} else {
+		store.setValue(tiddler,'server',null);
+	}
+	return false;
+};
+
+config.commands.fields.handlePopup = function(popup,title)
+{
+	var tiddler = store.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	var fields = {};
+	store.forEachField(tiddler,function(tiddler,fieldName,value) {fields[fieldName] = value;},true);
+	var items = [];
+	for(var t in fields) {
+		items.push({field: t,value: fields[t]});
+	}
+	items.sort(function(a,b) {return a.field < b.field ? -1 : (a.field == b.field ? 0 : +1);});
+	if(items.length > 0)
+		ListView.create(popup,items,this.listViewTemplate);
+	else
+		createTiddlyElement(popup,"div",null,null,this.emptyText);
+};
+
+//--
+//-- Tiddler() object
+//--
+
+function Tiddler(title)
+{
+	this.title = title;
+	this.text = null;
+	this.modifier = null;
+	this.modified = new Date();
+	this.created = new Date();
+	this.links = [];
+	this.linksUpdated = false;
+	this.tags = [];
+	this.fields = {};
+	return this;
+}
+
+Tiddler.prototype.getLinks = function()
+{
+	if(this.linksUpdated==false)
+		this.changed();
+	return this.links;
+};
+
+// Returns the fields that are inherited in string field:"value" field2:"value2" format
+Tiddler.prototype.getInheritedFields = function()
+{
+	var f = {};
+	for(i in this.fields) {
+		if(i=="server.host" || i=="server.workspace" || i=="wikiformat"|| i=="server.type") {
+			f[i] = this.fields[i];
+		}
+	}
+	return String.encodeHashMap(f);
+};
+
+// Increment the changeCount of a tiddler
+Tiddler.prototype.incChangeCount = function()
+{
+	var c = this.fields['changecount'];
+	c = c ? parseInt(c) : 0;
+	this.fields['changecount'] = String(c+1);
+};
+
+// Clear the changeCount of a tiddler
+Tiddler.prototype.clearChangeCount = function()
+{
+	if(this.fields['changecount']) {
+		delete this.fields['changecount'];
+	}
+};
+
+// Returns true if the tiddler has been updated since the tiddler was created or downloaded
+Tiddler.prototype.isTouched = function()
+{
+	var changeCount = this.fields['changecount'];
+	if(changeCount === undefined)
+		changeCount = 0;
+	return changeCount > 0;
+};
+
+// Format the text for storage in an RSS item
+Tiddler.prototype.saveToRss = function(url)
+{
+	var s = [];
+	s.push("<item>");
+	s.push("<title" + ">" + this.title.htmlEncode() + "</title" + ">");
+	s.push("<description>" + wikifyStatic(this.text,null,this).htmlEncode() + "</description>");
+	for(var t=0; t<this.tags.length; t++)
+		s.push("<category>" + this.tags[t] + "</category>");
+	s.push("<link>" + url + "#" + encodeURIComponent(String.encodeTiddlyLink(this.title)) + "</link>");
+	s.push("<pubDate>" + this.modified.toGMTString() + "</pubDate>");
+	s.push("</item>");
+	return s.join("\n");
+};
+
+// Change the text and other attributes of a tiddler
+Tiddler.prototype.set = function(title,text,modifier,modified,tags,created,fields)
+{
+	this.assign(title,text,modifier,modified,tags,created,fields);
+	this.changed();
+	return this;
+};
+
+// Change the text and other attributes of a tiddler without triggered a tiddler.changed() call
+Tiddler.prototype.assign = function(title,text,modifier,modified,tags,created,fields)
+{
+	if(title != undefined)
+		this.title = title;
+	if(text != undefined)
+		this.text = text;
+	if(modifier != undefined)
+		this.modifier = modifier;
+	if(modified != undefined)
+		this.modified = modified;
+	if(created != undefined)
+		this.created = created;
+	if(fields != undefined)
+		this.fields = fields;
+	if(tags != undefined)
+		this.tags = (typeof tags == "string") ? tags.readBracketedList() : tags;
+	else if(this.tags == undefined)
+		this.tags = [];
+	return this;
+};
+
+// Get the tags for a tiddler as a string (space delimited, using [[brackets]] for tags containing spaces)
+Tiddler.prototype.getTags = function()
+{
+	return String.encodeTiddlyLinkList(this.tags);
+};
+
+// Test if a tiddler carries a tag
+Tiddler.prototype.isTagged = function(tag)
+{
+	return this.tags.indexOf(tag) != -1;
+};
+
+// Static method to convert "\n" to newlines, "\s" to "\"
+Tiddler.unescapeLineBreaks = function(text)
+{
+	return text ? text.unescapeLineBreaks() : "";
+};
+
+// Convert newlines to "\n", "\" to "\s"
+Tiddler.prototype.escapeLineBreaks = function()
+{
+	return this.text.escapeLineBreaks();
+};
+
+// Updates the secondary information (like links[] array) after a change to a tiddler
+Tiddler.prototype.changed = function()
+{
+	this.links = [];
+	var t = this.autoLinkWikiWords() ? 0 : 1;
+	var tiddlerLinkRegExp = t==0 ? config.textPrimitives.tiddlerAnyLinkRegExp : config.textPrimitives.tiddlerForcedLinkRegExp;
+	tiddlerLinkRegExp.lastIndex = 0;
+	var formatMatch = tiddlerLinkRegExp.exec(this.text);
+	while(formatMatch) {
+		var lastIndex = tiddlerLinkRegExp.lastIndex;
+		if(t==0 && formatMatch[1] && formatMatch[1] != this.title) {
+			// wikiWordLink
+			if(formatMatch.index > 0) {
+				var preRegExp = new RegExp(config.textPrimitives.unWikiLink+"|"+config.textPrimitives.anyLetter,"mg");
+				preRegExp.lastIndex = formatMatch.index-1;
+				var preMatch = preRegExp.exec(this.text);
+				if(preMatch.index != formatMatch.index-1)
+					this.links.pushUnique(formatMatch[1]);
+			} else {
+				this.links.pushUnique(formatMatch[1]);
+			}
+		}
+		else if(formatMatch[2-t] && !config.formatterHelpers.isExternalLink(formatMatch[3-t])) // titledBrackettedLink
+			this.links.pushUnique(formatMatch[3-t]);
+		else if(formatMatch[4-t] && formatMatch[4-t] != this.title) // brackettedLink
+			this.links.pushUnique(formatMatch[4-t]);
+		tiddlerLinkRegExp.lastIndex = lastIndex;
+		formatMatch = tiddlerLinkRegExp.exec(this.text);
+	}
+	this.linksUpdated = true;
+};
+
+Tiddler.prototype.getSubtitle = function()
+{
+	var theModifier = this.modifier;
+	if(!theModifier)
+		theModifier = config.messages.subtitleUnknown;
+	var theModified = this.modified;
+	if(theModified)
+		theModified = theModified.toLocaleString();
+	else
+		theModified = config.messages.subtitleUnknown;
+	return config.messages.tiddlerLinkTooltip.format([this.title,theModifier,theModified]);
+};
+
+Tiddler.prototype.isReadOnly = function()
+{
+	return readOnly;
+};
+
+Tiddler.prototype.autoLinkWikiWords = function()
+{
+	return !(this.isTagged("systemConfig") || this.isTagged("excludeMissing"));
+};
+
+Tiddler.prototype.generateFingerprint = function()
+{
+	return "0x" + Crypto.hexSha1Str(this.text);
+};
+
+Tiddler.prototype.getServerType = function()
+{
+	var serverType = null;
+	if(this.fields && this.fields['server.type'])
+		serverType = this.fields['server.type'];
+	if(!serverType)
+		serverType = this.fields['wikiformat'];
+	if(serverType && !config.adaptors[serverType])
+		serverType = null;
+	return serverType;
+};
+
+Tiddler.prototype.getAdaptor = function()
+{
+	var serverType = this.getServerType();
+	if(serverType)
+		return new config.adaptors[serverType];
+	else
+		return null;
+};
+
+//--
+//-- TiddlyWiki() object contains Tiddler()s
+//--
+
+function TiddlyWiki()
+{
+	var tiddlers = {}; // Hashmap by name of tiddlers
+	this.tiddlersUpdated = false;
+	this.namedNotifications = []; // Array of {name:,notify:} of notification functions
+	this.notificationLevel = 0;
+	this.slices = {}; // map tiddlerName->(map sliceName->sliceValue). Lazy.
+	this.clear = function() {
+		tiddlers = {};
+		this.setDirty(false);
+	};
+	this.fetchTiddler = function(title) {
+		return tiddlers[title];
+	};
+	this.deleteTiddler = function(title) {
+		delete this.slices[title];
+		delete tiddlers[title];
+	};
+	this.addTiddler = function(tiddler) {
+		delete this.slices[tiddler.title];
+		tiddlers[tiddler.title] = tiddler;
+	};
+	this.forEachTiddler = function(callback) {
+		for(var t in tiddlers) {
+			var tiddler = tiddlers[t];
+			if(tiddler instanceof Tiddler)
+				callback.call(this,t,tiddler);
+		}
+	};
+}
+
+TiddlyWiki.prototype.setDirty = function(dirty)
+{
+	this.dirty = dirty;
+};
+
+TiddlyWiki.prototype.isDirty = function()
+{
+	return this.dirty;
+};
+
+TiddlyWiki.prototype.suspendNotifications = function()
+{
+	this.notificationLevel--;
+};
+
+TiddlyWiki.prototype.resumeNotifications = function()
+{
+	this.notificationLevel++;
+};
+
+// Invoke the notification handlers for a particular tiddler
+TiddlyWiki.prototype.notify = function(title,doBlanket)
+{
+	if(!this.notificationLevel) {
+		for(var t=0; t<this.namedNotifications.length; t++) {
+			var n = this.namedNotifications[t];
+			if((n.name == null && doBlanket) || (n.name == title))
+				n.notify(title);
+		}
+	}
+};
+
+// Invoke the notification handlers for all tiddlers
+TiddlyWiki.prototype.notifyAll = function()
+{
+	if(!this.notificationLevel) {
+		for(var t=0; t<this.namedNotifications.length; t++) {
+			var n = this.namedNotifications[t];
+			if(n.name)
+				n.notify(n.name);
+		}
+	}
+};
+
+// Add a notification handler to a tiddler
+TiddlyWiki.prototype.addNotification = function(title,fn)
+{
+	for(var i=0; i<this.namedNotifications.length; i++) {
+		if((this.namedNotifications[i].name == title) && (this.namedNotifications[i].notify == fn))
+			return this;
+	}
+	this.namedNotifications.push({name: title, notify: fn});
+	return this;
+};
+
+TiddlyWiki.prototype.removeTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		this.deleteTiddler(title);
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.tiddlerExists = function(title)
+{
+	var t = this.fetchTiddler(title);
+	return t != undefined;
+};
+
+TiddlyWiki.prototype.isShadowTiddler = function(title)
+{
+	return typeof config.shadowTiddlers[title] == "string";
+};
+
+TiddlyWiki.prototype.getTiddler = function(title)
+{
+	var t = this.fetchTiddler(title);
+	if(t != undefined)
+		return t;
+	else
+		return null;
+};
+
+TiddlyWiki.prototype.getTiddlerText = function(title,defaultText)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		return tiddler.text;
+	if(!title)
+		return defaultText;
+	var pos = title.indexOf(config.textPrimitives.sliceSeparator);
+	if(pos != -1) {
+		var slice = this.getTiddlerSlice(title.substr(0,pos),title.substr(pos + config.textPrimitives.sliceSeparator.length));
+		if(slice)
+			return slice;
+	}
+	if(this.isShadowTiddler(title))
+		return config.shadowTiddlers[title];
+	if(defaultText != undefined)
+		return defaultText;
+	return null;
+};
+
+TiddlyWiki.prototype.slicesRE = /(?:[\'\/]*~?([\.\w]+)[\'\/]*\:[\'\/]*\s*(.*?)\s*$)|(?:\|[\'\/]*~?([\.\w]+)\:?[\'\/]*\|\s*(.*?)\s*\|)/gm;
+
+// @internal
+TiddlyWiki.prototype.calcAllSlices = function(title)
+{
+	var slices = {};
+	var text = this.getTiddlerText(title,"");
+	this.slicesRE.lastIndex = 0;
+	do {
+		var m = this.slicesRE.exec(text);
+		if(m) {
+			if(m[1])
+				slices[m[1]] = m[2];
+			else
+				slices[m[3]] = m[4];
+		}
+	} while(m);
+	return slices;
+};
+
+// Returns the slice of text of the given name
+TiddlyWiki.prototype.getTiddlerSlice = function(title,sliceName)
+{
+	var slices = this.slices[title];
+	if(!slices) {
+		slices = this.calcAllSlices(title);
+		this.slices[title] = slices;
+	}
+	return slices[sliceName];
+};
+
+// Build an hashmap of the specified named slices of a tiddler
+TiddlyWiki.prototype.getTiddlerSlices = function(title,sliceNames)
+{
+	var r = {};
+	for(var t=0; t<sliceNames.length; t++) {
+		var slice = this.getTiddlerSlice(title,sliceNames[t]);
+		if(slice)
+			r[sliceNames[t]] = slice;
+	}
+	return r;
+};
+
+TiddlyWiki.prototype.getRecursiveTiddlerText = function(title,defaultText,depth)
+{
+	var bracketRegExp = new RegExp("(?:\\[\\[([^\\]]+)\\]\\])","mg");
+	var text = this.getTiddlerText(title,null);
+	if(text == null)
+		return defaultText;
+	var textOut = [];
+	var lastPos = 0;
+	do {
+		var match = bracketRegExp.exec(text);
+		if(match) {
+			textOut.push(text.substr(lastPos,match.index-lastPos));
+			if(match[1]) {
+				if(depth <= 0)
+					textOut.push(match[1]);
+				else
+					textOut.push(this.getRecursiveTiddlerText(match[1],"[[" + match[1] + "]]",depth-1));
+			}
+			lastPos = match.index + match[0].length;
+		} else {
+			textOut.push(text.substr(lastPos));
+		}
+	} while(match);
+	return textOut.join("");
+};
+
+TiddlyWiki.prototype.setTiddlerTag = function(title,status,tag)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		var t = tiddler.tags.indexOf(tag);
+		if(t != -1)
+			tiddler.tags.splice(t,1);
+		if(status)
+			tiddler.tags.push(tag);
+		tiddler.changed();
+		this.incChangeCount(title);
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.addTiddlerFields = function(title,fields)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	merge(tiddler.fields,fields);
+	tiddler.changed();
+	this.incChangeCount(title);
+	this.notify(title,true);
+	this.setDirty(true);
+};
+
+TiddlyWiki.prototype.saveTiddler = function(title,newTitle,newBody,modifier,modified,tags,fields,clearChangeCount,created)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		created = created ? created : tiddler.created; // Preserve created date
+		this.deleteTiddler(title);
+	} else {
+		created = created ? created : modified;
+		tiddler = new Tiddler();
+	}
+	tiddler.set(newTitle,newBody,modifier,modified,tags,created,fields);
+	this.addTiddler(tiddler);
+	if(clearChangeCount)
+		tiddler.clearChangeCount();
+	else
+		tiddler.incChangeCount();
+	if(title != newTitle)
+		this.notify(title,true);
+	this.notify(newTitle,true);
+	this.setDirty(true);
+	return tiddler;
+};
+
+// Reset the sync status of a freshly synced tiddler
+TiddlyWiki.prototype.resetTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		tiddler.clearChangeCount();
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.incChangeCount = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		tiddler.incChangeCount();
+};
+
+TiddlyWiki.prototype.createTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(!tiddler) {
+		tiddler = new Tiddler();
+		tiddler.title = title;
+		this.addTiddler(tiddler);
+		this.setDirty(true);
+	}
+	return tiddler;
+};
+
+// Load contents of a TiddlyWiki from an HTML DIV
+TiddlyWiki.prototype.loadFromDiv = function(src,idPrefix,noUpdate)
+{
+	this.idPrefix = idPrefix;
+	var storeElem = (typeof src == "string") ? document.getElementById(src) : src;
+	if(!storeElem)
+		return;
+	var tiddlers = this.getLoader().loadTiddlers(this,storeElem.childNodes);
+	this.setDirty(false);
+	if(!noUpdate) {
+		for(var i = 0;i<tiddlers.length; i++)
+			tiddlers[i].changed();
+	}
+};
+
+// Load contents of a TiddlyWiki from a string
+// Returns null if there's an error
+TiddlyWiki.prototype.importTiddlyWiki = function(text)
+{
+	var posDiv = locateStoreArea(text);
+	if(!posDiv)
+		return null;
+	var content = "<" + "html><" + "body>" + text.substring(posDiv[0],posDiv[1] + endSaveArea.length) + "<" + "/body><" + "/html>";
+	// Create the iframe
+	var iframe = document.createElement("iframe");
+	iframe.style.display = "none";
+	document.body.appendChild(iframe);
+	var doc = iframe.document;
+	if(iframe.contentDocument)
+		doc = iframe.contentDocument; // For NS6
+	else if(iframe.contentWindow)
+		doc = iframe.contentWindow.document; // For IE5.5 and IE6
+	// Put the content in the iframe
+	doc.open();
+	doc.writeln(content);
+	doc.close();
+	// Load the content into a TiddlyWiki() object
+	var storeArea = doc.getElementById("storeArea");
+	this.loadFromDiv(storeArea,"store");
+	// Get rid of the iframe
+	iframe.parentNode.removeChild(iframe);
+	return this;
+};
+
+TiddlyWiki.prototype.updateTiddlers = function()
+{
+	this.tiddlersUpdated = true;
+	this.forEachTiddler(function(title,tiddler) {
+		tiddler.changed();
+	});
+};
+
+// Return all tiddlers formatted as an HTML string
+TiddlyWiki.prototype.allTiddlersAsHtml = function()
+{
+	return store.getSaver().externalize(store);
+};
+
+// Return an array of tiddlers matching a search regular expression
+TiddlyWiki.prototype.search = function(searchRegExp,sortField,excludeTag)
+{
+	var candidates = this.reverseLookup("tags",excludeTag,false);
+	var results = [];
+	for(var t=0; t<candidates.length; t++) {
+		if((candidates[t].title.search(searchRegExp) != -1) || (candidates[t].text.search(searchRegExp) != -1))
+			results.push(candidates[t]);
+	}
+	if(!sortField)
+		sortField = "title";
+	results.sort(function(a,b) {return a[sortField] < b[sortField] ? -1 : (a[sortField] == b[sortField] ? 0 : +1);});
+	return results;
+};
+
+// Return an array of all the tags in use. Each member of the array is another array where [0] is the name of the tag and [1] is the number of occurances
+TiddlyWiki.prototype.getTags = function(excludeTag)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		for(var g=0; g<tiddler.tags.length; g++) {
+			var tag = tiddler.tags[g];
+			if(excludeTag) {
+				var t = store.fetchTiddler(tag);
+				if(t && t.isTagged(excludeTag))
+					return false;
+			}
+			var f = false;
+			for(var c=0; c<results.length; c++) {
+				if(results[c][0] == tag) {
+					f = true;
+					results[c][1]++;
+				}
+			}
+			if(!f)
+				results.push([tag,1]);
+		}
+	});
+	results.sort(function(a,b) {return a[0].toLowerCase() < b[0].toLowerCase() ? -1 : (a[0].toLowerCase() == b[0].toLowerCase() ? 0 : +1);});
+	return results;
+};
+
+// Return an array of the tiddlers that are tagged with a given tag
+TiddlyWiki.prototype.getTaggedTiddlers = function(tag,sortField)
+{
+	return this.reverseLookup("tags",tag,true,sortField);
+};
+
+// Return an array of the tiddlers that link to a given tiddler
+TiddlyWiki.prototype.getReferringTiddlers = function(title,unusedParameter,sortField)
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	return this.reverseLookup("links",title,true,sortField);
+};
+
+// Return an array of the tiddlers that do or do not have a specified entry in the specified storage array (ie, "links" or "tags")
+// lookupMatch == true to match tiddlers, false to exclude tiddlers
+TiddlyWiki.prototype.reverseLookup = function(lookupField,lookupValue,lookupMatch,sortField)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		var f = !lookupMatch;
+		for(var lookup=0; lookup<tiddler[lookupField].length; lookup++) {
+			if(tiddler[lookupField][lookup] == lookupValue)
+				f = lookupMatch;
+		}
+		if(f)
+			results.push(tiddler);
+	});
+	if(!sortField)
+		sortField = "title";
+	results.sort(function(a,b) {return a[sortField] < b[sortField] ? -1 : (a[sortField] == b[sortField] ? 0 : +1);});
+	return results;
+};
+
+// Return the tiddlers as a sorted array
+TiddlyWiki.prototype.getTiddlers = function(field,excludeTag)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		if(excludeTag == undefined || !tiddler.isTagged(excludeTag))
+			results.push(tiddler);
+	});
+	if(field)
+		results.sort(function(a,b) {return a[field] < b[field] ? -1 : (a[field] == b[field] ? 0 : +1);});
+	return results;
+};
+
+// Return array of names of tiddlers that are referred to but not defined
+TiddlyWiki.prototype.getMissingLinks = function(sortField)
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		if(tiddler.isTagged("excludeMissing") || tiddler.isTagged("systemConfig"))
+			return;
+		for(var n=0; n<tiddler.links.length;n++) {
+			var link = tiddler.links[n];
+			if(this.fetchTiddler(link) == null && !this.isShadowTiddler(link))
+				results.pushUnique(link);
+		}
+	});
+	results.sort();
+	return results;
+};
+
+// Return an array of names of tiddlers that are defined but not referred to
+TiddlyWiki.prototype.getOrphans = function()
+{
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		if(this.getReferringTiddlers(title).length == 0 && !tiddler.isTagged("excludeLists"))
+			results.push(title);
+	});
+	results.sort();
+	return results;
+};
+
+// Return an array of names of all the shadow tiddlers
+TiddlyWiki.prototype.getShadowed = function()
+{
+	var results = [];
+	for(var t in config.shadowTiddlers) {
+		if(typeof config.shadowTiddlers[t] == "string")
+			results.push(t);
+	}
+	results.sort();
+	return results;
+};
+
+// Return an array of tiddlers that have been touched since they were downloaded or created
+TiddlyWiki.prototype.getTouched = function()
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		if(tiddler.isTouched())
+			results.push(tiddler);
+		});
+	results.sort();
+	return results;
+};
+
+// Resolves a Tiddler reference or tiddler title into a Tiddler object, or null if it doesn't exist
+TiddlyWiki.prototype.resolveTiddler = function(tiddler)
+{
+	var t = (typeof tiddler == 'string') ? this.getTiddler(tiddler) : tiddler;
+	return t instanceof Tiddler ? t : null;
+};
+
+TiddlyWiki.prototype.getLoader = function()
+{
+	if(!this.loader)
+		this.loader = new TW21Loader();
+	return this.loader;
+};
+
+TiddlyWiki.prototype.getSaver = function()
+{
+	if(!this.saver)
+		this.saver = new TW21Saver();
+	return this.saver;
+};
+
+// Returns true if path is a valid field name (path),
+// i.e. a sequence of identifiers, separated by '.'
+TiddlyWiki.isValidFieldName = function(name)
+{
+	var match = /[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)*/.exec(name);
+	return match && (match[0] == name);
+};
+
+// Throws an exception when name is not a valid field name.
+TiddlyWiki.checkFieldName = function(name)
+{
+	if(!TiddlyWiki.isValidFieldName(name))
+		throw config.messages.invalidFieldName.format([name]);
+};
+
+function StringFieldAccess(n,readOnly)
+{
+	this.set = readOnly ?
+			function(t,v) {if(v != t[n]) throw config.messages.fieldCannotBeChanged.format([n]);} :
+			function(t,v) {if(v != t[n]) {t[n] = v; return true;}};
+	this.get = function(t) {return t[n];};
+}
+
+function DateFieldAccess(n)
+{
+	this.set = function(t,v) {
+		var d = v instanceof Date ? v : Date.convertFromYYYYMMDDHHMM(v);
+		if(d != t[n]) {
+			t[n] = d; return true;
+		}
+	};
+	this.get = function(t) {return t[n].convertToYYYYMMDDHHMM();};
+}
+
+function LinksFieldAccess(n)
+{
+	this.set = function(t,v) {
+		var s = (typeof v == "string") ? v.readBracketedList() : v;
+		if(s.toString() != t[n].toString()) {
+			t[n] = s; return true;
+		}
+	};
+	this.get = function(t) {return String.encodeTiddlyLinkList(t[n]);};
+}
+
+TiddlyWiki.standardFieldAccess = {
+	// The set functions return true when setting the data has changed the value.
+	"title":    new StringFieldAccess("title",true),
+	// Handle the "tiddler" field name as the title
+	"tiddler":  new StringFieldAccess("title",true),
+	"text":     new StringFieldAccess("text"),
+	"modifier": new StringFieldAccess("modifier"),
+	"modified": new DateFieldAccess("modified"),
+	"created":  new DateFieldAccess("created"),
+	"tags":     new LinksFieldAccess("tags")
+};
+
+TiddlyWiki.isStandardField = function(name)
+{
+	return TiddlyWiki.standardFieldAccess[name] != undefined;
+};
+
+// Sets the value of the given field of the tiddler to the value.
+// Setting an ExtendedField's value to null or undefined removes the field.
+// Setting a namespace to undefined removes all fields of that namespace.
+// The fieldName is case-insensitive.
+// All values will be converted to a string value.
+TiddlyWiki.prototype.setValue = function(tiddler,fieldName,value)
+{
+	TiddlyWiki.checkFieldName(fieldName);
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return;
+	fieldName = fieldName.toLowerCase();
+	var isRemove = (value === undefined) || (value === null);
+	var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+	if(accessor) {
+		if(isRemove)
+			// don't remove StandardFields
+			return;
+		var h = TiddlyWiki.standardFieldAccess[fieldName];
+		if(!h.set(t,value))
+			return;
+	} else {
+		var oldValue = t.fields[fieldName];
+		if(isRemove) {
+			if(oldValue !== undefined) {
+				// deletes a single field
+				delete t.fields[fieldName];
+			} else {
+				// no concrete value is defined for the fieldName
+				// so we guess this is a namespace path.
+				// delete all fields in a namespace
+				var re = new RegExp('^'+fieldName+'\\.');
+				var dirty = false;
+				for(var n in t.fields) {
+					if(n.match(re)) {
+						delete t.fields[n];
+						dirty = true;
+					}
+				}
+				if(!dirty)
+					return;
+			}
+		} else {
+			// the "normal" set case. value is defined (not null/undefined)
+			// For convenience provide a nicer conversion Date->String
+			value = value instanceof Date ? value.convertToYYYYMMDDHHMMSSMMM() : String(value);
+			if(oldValue == value)
+				return;
+			t.fields[fieldName] = value;
+		}
+	}
+	// When we are here the tiddler/store really was changed.
+	this.notify(t.title,true);
+	if(!fieldName.match(/^temp\./))
+		this.setDirty(true);
+};
+
+// Returns the value of the given field of the tiddler.
+// The fieldName is case-insensitive.
+// Will only return String values (or undefined).
+TiddlyWiki.prototype.getValue = function(tiddler,fieldName)
+{
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return undefined;
+	fieldName = fieldName.toLowerCase();
+	var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+	if(accessor) {
+		return accessor.get(t);
+	}
+	return t.fields[fieldName];
+};
+
+// Calls the callback function for every field in the tiddler.
+// When callback function returns a non-false value the iteration stops
+// and that value is returned.
+// The order of the fields is not defined.
+// @param callback a function(tiddler,fieldName,value).
+TiddlyWiki.prototype.forEachField = function(tiddler,callback,onlyExtendedFields)
+{
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return undefined;
+	for(var n in t.fields) {
+		var result = callback(t,n,t.fields[n]);
+		if(result)
+			return result;
+		}
+	if(onlyExtendedFields)
+		return undefined;
+	for(var n in TiddlyWiki.standardFieldAccess) {
+		if(n == "tiddler")
+			// even though the "title" field can also be referenced through the name "tiddler"
+			// we only visit this field once.
+			continue;
+		var result = callback(t,n,TiddlyWiki.standardFieldAccess[n].get(t));
+		if(result)
+			return result;
+	}
+	return undefined;
+};
+
+//--
+//-- Story functions
+//--
+
+function Story(container,idPrefix)
+{
+	this.container = container;
+	this.idPrefix = idPrefix;
+	this.highlightRegExp = null;
+}
+
+Story.prototype.forEachTiddler = function(fn)
+{
+	var place = document.getElementById(this.container);
+	if(!place)
+		return;
+	var e = place.firstChild;
+	while(e) {
+		var n = e.nextSibling;
+		var title = e.getAttribute("tiddler");
+		fn.call(this,title,e);
+		e = n;
+	}
+};
+
+Story.prototype.displayTiddlers = function(srcElement,titles,template,animate,unused,customFields,toggle)
+{
+	for(var t = titles.length-1;t>=0;t--)
+		this.displayTiddler(srcElement,titles[t],template,animate,unused,customFields);
+};
+
+Story.prototype.displayTiddler = function(srcElement,title,template,animate,unused,customFields,toggle)
+{
+	var place = document.getElementById(this.container);
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem) {
+		if(toggle)
+			this.closeTiddler(title,true);
+		else
+			this.refreshTiddler(title,template,false,customFields);
+	} else {
+		var before = this.positionTiddler(srcElement);
+		tiddlerElem = this.createTiddler(place,before,title,template,customFields);
+	}
+	if(srcElement && typeof srcElement !== "string") {
+		if(config.options.chkAnimate && (animate == undefined || animate == true) && anim && typeof Zoomer == "function" && typeof Scroller == "function")
+			anim.startAnimating(new Zoomer(title,srcElement,tiddlerElem),new Scroller(tiddlerElem));
+		else
+			window.scrollTo(0,ensureVisible(tiddlerElem));
+	}
+};
+
+Story.prototype.positionTiddler = function(srcElement)
+{
+	var place = document.getElementById(this.container);
+	var before = null;
+	if(typeof srcElement == "string") {
+		switch(srcElement) {
+			case "top":
+				before = place.firstChild;
+				break;
+			case "bottom":
+				before = null;
+				break;
+		}
+	} else {
+		var after = this.findContainingTiddler(srcElement);
+		if(after == null) {
+			before = place.firstChild;
+		} else if(after.nextSibling) {
+			before = after.nextSibling;
+			if(before.nodeType != 1)
+				before = null;
+		}
+	}
+	return before;
+};
+
+Story.prototype.createTiddler = function(place,before,title,template,customFields)
+{
+	var tiddlerElem = createTiddlyElement(null,"div",this.idPrefix + title,"tiddler");
+	tiddlerElem.setAttribute("refresh","tiddler");
+	if(customFields)
+		tiddlerElem.setAttribute("tiddlyFields",customFields);
+	place.insertBefore(tiddlerElem,before);
+	var defaultText = null;
+	if(!store.tiddlerExists(title) && !store.isShadowTiddler(title))
+		defaultText = this.loadMissingTiddler(title,customFields,tiddlerElem);
+	this.refreshTiddler(title,template,false,customFields,defaultText);
+	return tiddlerElem;
+};
+
+Story.prototype.loadMissingTiddler = function(title,fields,tiddlerElem)
+{
+	var tiddler = new Tiddler(title);
+	tiddler.fields = typeof fields == "string" ?  fields.decodeHashMap() : (fields ? fields : {});
+	var serverType = tiddler.getServerType();
+	var host = tiddler.fields['server.host'];
+	var workspace = tiddler.fields['server.workspace'];
+	if(!serverType | !host)
+		return null;
+	var sm = new SyncMachine(serverType,{
+			start: function() {
+				return this.openHost(host,"openWorkspace");
+			},
+			openWorkspace: function() {
+				return this.openWorkspace(workspace,"getTiddler");
+			},
+			getTiddler: function() {
+				return this.getTiddler(title,"gotTiddler");
+			},
+			gotTiddler: function(tiddler) {
+				if(tiddler && tiddler.text) {
+					var downloaded = new Date();
+					if(!tiddler.created)
+						tiddler.created = downloaded;
+					if(!tiddler.modified)
+						tiddler.modified = tiddler.created;
+					store.saveTiddler(tiddler.title,tiddler.title,tiddler.text,tiddler.modifier,tiddler.modified,tiddler.tags,tiddler.fields,true,tiddler.created);
+					autoSaveChanges();
+				}
+				delete this;
+				return true;
+			},
+			error: function(message) {
+				displayMessage("Error loading missing tiddler from %0: %1".format([host,message]));
+			}
+		});
+	sm.go();
+	return config.messages.loadingMissingTiddler.format([title,serverType,host,workspace]);
+};
+
+Story.prototype.chooseTemplateForTiddler = function(title,template)
+{
+	if(!template)
+		template = DEFAULT_VIEW_TEMPLATE;
+	if(template == DEFAULT_VIEW_TEMPLATE || template == DEFAULT_EDIT_TEMPLATE)
+		template = config.tiddlerTemplates[template];
+	return template;
+};
+
+Story.prototype.getTemplateForTiddler = function(title,template,tiddler)
+{
+	return store.getRecursiveTiddlerText(template,null,10);
+};
+
+Story.prototype.refreshTiddler = function(title,template,force,customFields,defaultText)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem) {
+		if(tiddlerElem.getAttribute("dirty") == "true" && !force)
+			return tiddlerElem;
+		template = this.chooseTemplateForTiddler(title,template);
+		var currTemplate = tiddlerElem.getAttribute("template");
+		if((template != currTemplate) || force) {
+			var tiddler = store.getTiddler(title);
+			if(!tiddler) {
+				tiddler = new Tiddler();
+				if(store.isShadowTiddler(title)) {
+					tiddler.set(title,store.getTiddlerText(title),config.views.wikified.shadowModifier,version.date,[],version.date);
+				} else {
+					var text = template=="EditTemplate" ?
+								config.views.editor.defaultText.format([title]) :
+								config.views.wikified.defaultText.format([title]);
+					text = defaultText ? defaultText : text;
+					var fields = customFields ? customFields.decodeHashMap() : null;
+					tiddler.set(title,text,config.views.wikified.defaultModifier,version.date,[],version.date,fields);
+				}
+			}
+			tiddlerElem.setAttribute("tags",tiddler.tags.join(" "));
+			tiddlerElem.setAttribute("tiddler",title);
+			tiddlerElem.setAttribute("template",template);
+			var me = this;
+			tiddlerElem.onmouseover = this.onTiddlerMouseOver;
+			tiddlerElem.onmouseout = this.onTiddlerMouseOut;
+			tiddlerElem.ondblclick = this.onTiddlerDblClick;
+			tiddlerElem[window.event?"onkeydown":"onkeypress"] = this.onTiddlerKeyPress;
+			var html = this.getTemplateForTiddler(title,template,tiddler);
+			tiddlerElem.innerHTML = html;
+			applyHtmlMacros(tiddlerElem,tiddler);
+			if(store.getTaggedTiddlers(title).length > 0)
+				addClass(tiddlerElem,"isTag");
+			else
+				removeClass(tiddlerElem,"isTag");
+			if(!store.tiddlerExists(title)) {
+				if(store.isShadowTiddler(title))
+					addClass(tiddlerElem,"shadow");
+				else
+					addClass(tiddlerElem,"missing");
+			} else {
+				removeClass(tiddlerElem,"shadow");
+				removeClass(tiddlerElem,"missing");
+			}
+			if(customFields)
+				this.addCustomFields(tiddlerElem,customFields);
+			forceReflow();
+		}
+	}
+	return tiddlerElem;
+};
+
+Story.prototype.addCustomFields = function(place,customFields)
+{
+	var fields = customFields.decodeHashMap();
+	var w = document.createElement("div");
+	w.style.display = "none";
+	place.appendChild(w);
+	for(var t in fields) {
+		var e = document.createElement("input");
+		e.setAttribute("type","text");
+		e.setAttribute("value",fields[t]);
+		w.appendChild(e);
+		e.setAttribute("edit",t);
+	}
+};
+
+Story.prototype.refreshAllTiddlers = function() 
+{
+	var place = document.getElementById(this.container);
+	var e = place.firstChild;
+	if(!e)
+		return;
+	this.refreshTiddler(e.getAttribute("tiddler"),e.getAttribute("template"),true);
+	while((e = e.nextSibling) != null) 
+		this.refreshTiddler(e.getAttribute("tiddler"),e.getAttribute("template"),true);
+};
+
+Story.prototype.onTiddlerMouseOver = function(e)
+{
+	if(window.addClass instanceof Function)
+		addClass(this,"selected");
+};
+
+Story.prototype.onTiddlerMouseOut = function(e)
+{
+	if(window.removeClass instanceof Function)
+		removeClass(this,"selected");
+};
+
+Story.prototype.onTiddlerDblClick = function(e)
+{
+	if(!e) var e = window.event;
+	var theTarget = resolveTarget(e);
+	if(theTarget && theTarget.nodeName.toLowerCase() != "input" && theTarget.nodeName.toLowerCase() != "textarea") {
+		if(document.selection && document.selection.empty)
+			document.selection.empty();
+		config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+		e.cancelBubble = true;
+		if(e.stopPropagation) e.stopPropagation();
+		return true;
+	} else {
+		return false;
+	}
+};
+
+Story.prototype.onTiddlerKeyPress = function(e)
+{
+	if(!e) var e = window.event;
+	clearMessage();
+	var consume = false; 
+	var title = this.getAttribute("tiddler");
+	var target = resolveTarget(e);
+	switch(e.keyCode) {
+		case 9: // Tab
+			if(config.options.chkInsertTabs && target.tagName.toLowerCase() == "textarea") {
+				replaceSelection(target,String.fromCharCode(9));
+				consume = true; 
+			}
+			if(config.isOpera) {
+				target.onblur = function() {
+					this.focus();
+					this.onblur = null;
+				};
+			}
+			break;
+		case 13: // Ctrl-Enter
+		case 10: // Ctrl-Enter on IE PC
+		case 77: // Ctrl-Enter is "M" on some platforms
+			if(e.ctrlKey) {
+				blurElement(this);
+				config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+				consume = true;
+			}
+			break; 
+		case 27: // Escape
+			blurElement(this);
+			config.macros.toolbar.invokeCommand(this,"cancelCommand",e);
+			consume = true;
+			break;
+	}
+	e.cancelBubble = consume;
+	if(consume) {
+		if(e.stopPropagation) e.stopPropagation(); // Stop Propagation
+		e.returnValue = true; // Cancel The Event in IE
+		if(e.preventDefault ) e.preventDefault(); // Cancel The Event in Moz
+	}
+	return !consume;
+};
+
+Story.prototype.getTiddlerField = function(title,field)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	var e = null;
+	if(tiddlerElem != null) {
+		var children = tiddlerElem.getElementsByTagName("*");
+		for(var t=0; t<children.length; t++) {
+			var c = children[t];
+			if(c.tagName.toLowerCase() == "input" || c.tagName.toLowerCase() == "textarea") {
+				if(!e)
+					e = c;
+				if(c.getAttribute("edit") == field)
+					e = c;
+			}
+		}
+	}
+	return e;
+};
+
+Story.prototype.focusTiddler = function(title,field)
+{
+	var e = this.getTiddlerField(title,field);
+	if(e) {
+		e.focus();
+		e.select();
+	}
+};
+
+Story.prototype.blurTiddler = function(title)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null && tiddlerElem.focus && tiddlerElem.blur) {
+		tiddlerElem.focus();
+		tiddlerElem.blur();
+	}
+};
+
+Story.prototype.setTiddlerField = function(title,tag,mode,field)
+{
+	var c = story.getTiddlerField(title,field);
+
+	var tags = c.value.readBracketedList();
+	tags.setItem(tag,mode);
+	c.value = String.encodeTiddlyLinkList(tags);
+};
+
+Story.prototype.setTiddlerTag = function(title,tag,mode)
+{
+	Story.prototype.setTiddlerField(title,tag,mode,"tags");
+};
+
+Story.prototype.closeTiddler = function(title,animate,unused)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null) {
+		clearMessage();
+		this.scrubTiddler(tiddlerElem);
+		if(config.options.chkAnimate && animate && anim && typeof Slider == "function")
+			anim.startAnimating(new Slider(tiddlerElem,false,null,"all"));
+		else {
+			removeNode(tiddlerElem);
+			forceReflow();
+		}
+	}
+};
+
+Story.prototype.scrubTiddler = function(tiddlerElem)
+{
+	tiddlerElem.id = null;
+};
+
+Story.prototype.setDirty = function(title,dirty)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		tiddlerElem.setAttribute("dirty",dirty ? "true" : "false");
+};
+
+Story.prototype.isDirty = function(title)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		return tiddlerElem.getAttribute("dirty") == "true";
+	return null;
+};
+
+Story.prototype.areAnyDirty = function()
+{
+	var r = false;
+	this.forEachTiddler(function(title,element) {
+		if(this.isDirty(title))
+			r = true;
+	});
+	return r;
+};
+
+Story.prototype.closeAllTiddlers = function(exclude)
+{
+	clearMessage();
+	this.forEachTiddler(function(title,element) {
+		if((title != exclude) && element.getAttribute("dirty") != "true")
+			this.closeTiddler(title);
+	});
+	window.scrollTo(0,ensureVisible(this.container));
+};
+
+Story.prototype.isEmpty = function()
+{
+	var place = document.getElementById(this.container);
+	return place && place.firstChild == null;
+};
+
+Story.prototype.search = function(text,useCaseSensitive,useRegExp)
+{
+	this.closeAllTiddlers();
+	highlightHack = new RegExp(useRegExp ?	 text : text.escapeRegExp(),useCaseSensitive ? "mg" : "img");
+	var matches = store.search(highlightHack,"title","excludeSearch");
+	var titles = [];
+	for(var t=0;t<matches.length;t++)
+		titles.push(matches[t].title);
+	this.displayTiddlers(null,titles);
+	highlightHack = null;
+	var q = useRegExp ? "/" : "'";
+	if(matches.length > 0)
+		displayMessage(config.macros.search.successMsg.format([titles.length.toString(),q + text + q]));
+	else
+		displayMessage(config.macros.search.failureMsg.format([q + text + q]));
+};
+
+Story.prototype.findContainingTiddler = function(e)
+{
+	while(e && !hasClass(e,"tiddler"))
+		e = e.parentNode;
+	return e;
+};
+
+Story.prototype.gatherSaveFields = function(e,fields)
+{
+	if(e && e.getAttribute) {
+		var f = e.getAttribute("edit");
+		if(f)
+			fields[f] = e.value.replace(/\r/mg,"");
+		if(e.hasChildNodes()) {
+			var c = e.childNodes;
+			for(var t=0; t<c.length; t++)
+				this.gatherSaveFields(c[t],fields);
+		}
+	}
+};
+
+Story.prototype.hasChanges = function(title)
+{
+	var e = document.getElementById(this.idPrefix + title);
+	if(e != null) {
+		var fields = {};
+		this.gatherSaveFields(e,fields);
+		var tiddler = store.fetchTiddler(title);
+		if(!tiddler)
+			return false;
+		for(var n in fields) {
+			if(store.getValue(title,n) != fields[n])
+				return true;
+		}
+	}
+	return false;
+};
+
+Story.prototype.saveTiddler = function(title,minorUpdate)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null) {
+		var fields = {};
+		this.gatherSaveFields(tiddlerElem,fields);
+		var newTitle = fields.title ? fields.title : title;
+		if(store.tiddlerExists(newTitle) && newTitle != title) {
+			if(!confirm(config.messages.overwriteWarning.format([newTitle.toString()])))
+				return null;
+		}
+		if(newTitle != title)
+			this.closeTiddler(newTitle,false);
+		tiddlerElem.id = this.idPrefix + newTitle;
+		tiddlerElem.setAttribute("tiddler",newTitle);
+		tiddlerElem.setAttribute("template",DEFAULT_VIEW_TEMPLATE);
+		tiddlerElem.setAttribute("dirty","false");
+		if(config.options.chkForceMinorUpdate)
+			minorUpdate = !minorUpdate;
+		if(!store.tiddlerExists(newTitle))
+			minorUpdate = false;
+		var newDate = new Date();
+		var extendedFields = store.tiddlerExists(newTitle) ? store.fetchTiddler(newTitle).fields : {};
+		for(var n in fields) {
+			if(!TiddlyWiki.isStandardField(n))
+				extendedFields[n] = fields[n];
+			}
+		var tiddler = store.saveTiddler(title,newTitle,fields.text,minorUpdate ? undefined : config.options.txtUserName,minorUpdate ? undefined : newDate,fields.tags,extendedFields);
+		autoSaveChanges(null,[tiddler]);
+		return newTitle;
+	}
+	return null;
+};
+
+Story.prototype.permaView = function()
+{
+	var links = [];
+	this.forEachTiddler(function(title,element) {
+		links.push(String.encodeTiddlyLink(title));
+	});
+	var t = encodeURIComponent(links.join(" "));
+	if(t == "")
+		t = "#";
+	if(window.location.hash != t)
+		window.location.hash = t;
+};
+
+//--
+//-- Backstage
+//--
+
+var backstage = {
+	area: null,
+	toolbar: null,
+	button: null,
+	showButton: null,
+	hideButton: null,
+	cloak: null,
+	panel: null,
+	panelBody: null,
+	panelFooter: null,
+	currTabName: null,
+	currTabElem: null,
+	content: null,
+
+	init: function() {
+		var cmb = config.messages.backstage;
+		this.area = document.getElementById("backstageArea");
+		this.toolbar = document.getElementById("backstageToolbar");
+		this.button = document.getElementById("backstageButton");
+		this.button.style.display = "block";
+		var t = cmb.open.text + " " + glyph("bentArrowLeft");
+		this.showButton = createTiddlyButton(this.button,t,cmb.open.tooltip,
+						function (e) {backstage.show(); return false;},null,"backstageShow");
+		t = glyph("bentArrowRight") + " " + cmb.close.text;
+		this.hideButton = createTiddlyButton(this.button,t,cmb.close.tooltip,
+						function (e) {backstage.hide(); return false;},null,"backstageHide");
+		this.cloak = document.getElementById("backstageCloak");
+		this.panel = document.getElementById("backstagePanel");
+		this.panelFooter = createTiddlyElement(this.panel,"div",null,"backstagePanelFooter");
+		this.panelBody = createTiddlyElement(this.panel,"div",null,"backstagePanelBody");
+		this.cloak.onmousedown = function(e) {
+			backstage.switchTab(null);
+		};
+		createTiddlyText(this.toolbar,cmb.prompt);
+		for(t=0; t<config.backstageTasks.length; t++) {
+			var taskName = config.backstageTasks[t];
+			var task = config.tasks[taskName];
+			var handler = task.action ? this.onClickCommand : this.onClickTab;
+			var text = task.text + (task.action ? "" : glyph("downTriangle"));
+			var btn = createTiddlyButton(this.toolbar,text,task.tooltip,handler,"backstageTab");
+			btn.setAttribute("task",taskName);
+			addClass(btn,task.action ? "backstageAction" : "backstageTask");
+			}
+		this.content = document.getElementById("contentWrapper");
+		if(config.options.chkBackstage)
+			this.show();
+		else
+			this.hide();
+	},
+	
+	isVisible: function () {
+		return this.area ? this.area.style.display == "block" : false;
+	},
+	
+	show: function() {
+		this.area.style.display = "block";
+		if(anim && config.options.chkAnimate) {
+			backstage.toolbar.style.left = findWindowWidth() + "px";
+			var p = [
+				{style: "left", start: findWindowWidth(), end: 0, template: "%0px"}
+			];
+			anim.startAnimating(new Morpher(backstage.toolbar,config.animDuration,p));
+		} else {
+			backstage.area.style.left = "0px";
+		}
+		this.showButton.style.display = "none";
+		this.hideButton.style.display = "block";
+		config.options.chkBackstage = true;
+		saveOptionCookie("chkBackstage");
+		addClass(this.content,"backstageVisible");
+	},
+
+	hide: function() {
+		if(this.currTabElem) {
+			this.switchTab(null);
+		} else {
+			backstage.toolbar.style.left = "0px";
+			if(anim && config.options.chkAnimate) {
+				var p = [
+					{style: "left", start: 0, end: findWindowWidth(), template: "%0px"}
+				];
+				var c = function(element,properties) {backstage.area.style.display = "none";};
+				anim.startAnimating(new Morpher(backstage.toolbar,config.animDuration,p,c));
+			} else {
+				this.area.style.display = "none";
+			}
+			this.showButton.style.display = "block";
+			this.hideButton.style.display = "none";
+			config.options.chkBackstage = false;
+			saveOptionCookie("chkBackstage");
+			removeClass(this.content,"backstageVisible");
+		}
+	},
+
+	onClickCommand: function(e) {
+		var task = config.tasks[this.getAttribute("task")];
+		displayMessage(task);
+		if(task.action) {
+			backstage.switchTab(null);
+			task.action();
+		}
+		return false;
+	},
+
+	onClickTab: function(e) {
+		backstage.switchTab(this.getAttribute("task"));
+		return false;
+	},
+
+	// Switch to a given tab, or none if null is passed
+	switchTab: function(tabName) {
+		var tabElem = null;
+		var e = this.toolbar.firstChild;
+		while(e)
+			{
+			if(e.getAttribute && e.getAttribute("task") == tabName)
+				tabElem = e;
+			e = e.nextSibling;
+			}
+		if(tabName == backstage.currTabName)
+			return;
+		if(backstage.currTabElem) {
+			removeClass(this.currTabElem,"backstageSelTab");
+		}
+		if(tabElem && tabName) {
+			backstage.preparePanel();
+			addClass(tabElem,"backstageSelTab");
+			var task = config.tasks[tabName];
+			wikify(task.content,backstage.panelBody,null,null);
+			backstage.showPanel();
+		} else if(backstage.currTabElem) {
+			backstage.hidePanel();
+		}
+		backstage.currTabName = tabName;
+		backstage.currTabElem = tabElem;
+	},
+
+	isPanelVisible: function() {
+		return backstage.panel ? backstage.panel.style.display == "block" : false;
+	},
+
+	preparePanel: function() {
+		backstage.cloak.style.height = findWindowHeight() + "px";
+		backstage.cloak.style.display = "block";
+		removeChildren(backstage.panelBody);
+		return backstage.panelBody;
+	},
+	
+	showPanel: function() {
+		backstage.panel.style.display = "block";
+		if(anim && config.options.chkAnimate) {
+			backstage.panel.style.top = (-backstage.panel.offsetHeight) + "px";
+			var p = [
+				{style: "top", start: -backstage.panel.offsetHeight, end: 0, template: "%0px"}
+			];
+			anim.startAnimating(new Morpher(backstage.panel,config.animDuration,p),new Scroller(backstage.panel,false));
+		} else {
+			backstage.panel.style.top = "0px";
+		}
+		return backstage.panelBody;
+	},
+	
+	hidePanel: function() {
+		backstage.currTabName = null;
+		backstage.currTabElem = null;
+		if(anim && config.options.chkAnimate) {
+			var p = [
+				{style: "top", start: 0, end: -(backstage.panel.offsetHeight), template: "%0px"},
+				{style: "display", atEnd: "none"}
+			];
+			var c = function(element,properties) {backstage.cloak.style.display = "none";};
+			anim.startAnimating(new Morpher(backstage.panel,config.animDuration,p,c));
+		 } else {
+			backstage.panel.style.display = "none";
+			backstage.cloak.style.display = "none";
+		}
+	}
+};
+
+config.macros.backstage = {};
+
+config.macros.backstage.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var backstageTask = config.tasks[params[0]];
+	if(backstageTask)
+		createTiddlyButton(place,backstageTask.text,backstageTask.tooltip,function(e) {backstage.switchTab(params[0]); return false;});
+};
+
+//--
+//-- ImportTiddlers macro
+//--
+
+config.macros.importTiddlers.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(readOnly) {
+		createTiddlyElement(place,"div",null,"marked",this.readOnlyWarning);
+		return;
+	}
+	var w = new Wizard();
+	w.createWizard(place,this.wizardTitle);
+	this.restart(w);
+};
+
+config.macros.importTiddlers.onCancel = function(e)
+{
+	var wizard = new Wizard(this);
+	var place = wizard.clear();
+	config.macros.importTiddlers.restart(wizard);
+	return false;
+};
+
+config.macros.importTiddlers.restart = function(wizard)
+{
+	wizard.addStep(this.step1Title,this.step1Html);
+	var s = wizard.getElement("selTypes");
+	for(var t in config.adaptors) {
+		var e = createTiddlyElement(s,"option",null,null,t);
+		e.value = t;
+	}
+	s = wizard.getElement("selFeeds");
+	var feeds = this.getFeeds();
+	for(t in feeds) {
+		e = createTiddlyElement(s,"option",null,null,t);
+		e.value = t;
+	}
+	wizard.setValue("feeds",feeds);
+	s.onchange = config.macros.importTiddlers.onFeedChange;
+	var fileInput = wizard.getElement("txtBrowse");
+	fileInput.onchange = config.macros.importTiddlers.onBrowseChange;
+	fileInput.onkeyup = config.macros.importTiddlers.onBrowseChange;
+	wizard.setButtons([{caption: this.openLabel, tooltip: this.openPrompt, onClick: config.macros.importTiddlers.onOpen}]);
+};
+
+config.macros.importTiddlers.getFeeds = function()
+{
+	var feeds = {};
+	var tagged = store.getTaggedTiddlers("systemServer","title");
+	for(var t=0; t<tagged.length; t++) {
+		var title = tagged[t].title;
+		var serverType = store.getTiddlerSlice(title,"Type");
+		if(!serverType)
+			serverType = "file";
+		feeds[title] = {title: title,
+						url: store.getTiddlerSlice(title,"URL"),
+						workspace: store.getTiddlerSlice(title,"Workspace"),
+						workspaceList: store.getTiddlerSlice(title,"WorkspaceList"),
+						tiddlerFilter: store.getTiddlerSlice(title,"TiddlerFilter"),
+						serverType: serverType,
+						description: store.getTiddlerSlice(title,"Description")};
+	}
+	return feeds;
+};
+
+config.macros.importTiddlers.onFeedChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var selTypes = wizard.getElement("selTypes");
+	var fileInput = wizard.getElement("txtPath");
+	var feeds = wizard.getValue("feeds");
+	var f = feeds[this.value];
+	if(f) {
+		selTypes.value = f.serverType;
+		fileInput.value = f.url;
+		this.selectedIndex = 0;
+		wizard.setValue("feedName",f.serverType);
+		wizard.setValue("feedHost",f.url);
+		wizard.setValue("feedWorkspace",f.workspace);
+		wizard.setValue("feedWorkspaceList",f.workspaceList);
+		wizard.setValue("feedTiddlerFilter",f.tiddlerFilter);
+	}
+	return false;
+};
+
+config.macros.importTiddlers.onBrowseChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var fileInput = wizard.getElement("txtPath");
+	fileInput.value = "file://" + this.value;
+	var serverType = wizard.getElement("selTypes");
+	serverType.value = "file";
+	return false;
+};
+
+config.macros.importTiddlers.onOpen = function(e)
+{
+	var wizard = new Wizard(this);
+	var fileInput = wizard.getElement("txtPath");
+	var url = fileInput.value;
+	var serverType = wizard.getElement("selTypes").value;
+	var adaptor = new config.adaptors[serverType];
+	wizard.setValue("adaptor",adaptor);
+	wizard.setValue("serverType",serverType);
+	wizard.setValue("host",url);
+	var context = {};
+	var ret = adaptor.openHost(url,context,wizard,config.macros.importTiddlers.onOpenHost);
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusOpenHost);
+	return false;
+};
+
+config.macros.importTiddlers.onOpenHost = function(context,wizard)
+{
+	var adaptor = wizard.getValue("adaptor");
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onOpenHost: " + context.statusText);
+	var ret = adaptor.getWorkspaceList(context,wizard,config.macros.importTiddlers.onGetWorkspaceList);
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusGetWorkspaceList);
+};
+
+config.macros.importTiddlers.onGetWorkspaceList = function(context,wizard)
+{
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onGetWorkspaceList: " + context.statusText);
+	wizard.addStep(config.macros.importTiddlers.step2Title,config.macros.importTiddlers.step2Html);
+	var s = wizard.getElement("selWorkspace");
+	s.onchange = config.macros.importTiddlers.onWorkspaceChange;
+	for(var t=0; t<context.workspaces.length; t++) {
+		var e = createTiddlyElement(s,"option",null,null,context.workspaces[t].title);
+		e.value = context.workspaces[t].title;
+	}
+	var workspaceList = wizard.getValue("feedWorkspaceList");
+	if(workspaceList) {
+		var list = workspaceList.parseParams("workspace",null,false,true);
+		for(var n=1; n<list.length; n++) {
+			if(context.workspaces.findByField("title",list[n].value) == null) {
+				e = createTiddlyElement(s,"option",null,null,list[n].value);
+				e.value = list[n].value;
+			}
+		}
+	}
+	var workspace = wizard.getValue("feedWorkspace");
+	if(workspace) {
+		t = wizard.getElement("txtWorkspace");
+		t.value = workspace;
+	}
+	wizard.setButtons([{caption: config.macros.importTiddlers.openLabel, tooltip: config.macros.importTiddlers.openPrompt, onClick: config.macros.importTiddlers.onChooseWorkspace}]);
+};
+
+config.macros.importTiddlers.onWorkspaceChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var t = wizard.getElement("txtWorkspace");
+	t.value  = this.value;
+	this.selectedIndex = 0;
+	return false;
+};
+
+config.macros.importTiddlers.onChooseWorkspace = function(e)
+{
+	var wizard = new Wizard(this);
+	var adaptor = wizard.getValue("adaptor");
+	var workspace = wizard.getElement("txtWorkspace").value;
+	wizard.setValue("workspace",workspace);
+	var context = {};
+	var ret = adaptor.openWorkspace(workspace,context,wizard,config.macros.importTiddlers.onOpenWorkspace);
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusOpenWorkspace);
+	return false;
+};
+
+config.macros.importTiddlers.onOpenWorkspace = function(context,wizard)
+{
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onOpenWorkspace: " + context.statusText);
+	var adaptor = wizard.getValue("adaptor");
+	var ret = adaptor.getTiddlerList(context,wizard,config.macros.importTiddlers.onGetTiddlerList,wizard.getValue("feedTiddlerFilter"));
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusGetTiddlerList);
+};
+
+config.macros.importTiddlers.onGetTiddlerList = function(context,wizard)
+{
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onGetTiddlerList: " + context.statusText);
+	// Extract data for the listview
+	var listedTiddlers = [];
+	if(context.tiddlers) {
+		for(var n=0; n<context.tiddlers.length; n++) {
+			var tiddler = context.tiddlers[n];
+			listedTiddlers.push({
+				title: tiddler.title,
+				modified: tiddler.modified,
+				modifier: tiddler.modifier,
+				text: tiddler.text ? wikifyPlainText(tiddler.text,100) : "",
+				tags: tiddler.tags,
+				size: tiddler.text ? tiddler.text.length : 0,
+				tiddler: tiddler
+			});
+		}
+	}
+	listedTiddlers.sort(function(a,b) {return a.title < b.title ? -1 : (a.title == b.title ? 0 : +1);});
+	// Display the listview
+	wizard.addStep(config.macros.importTiddlers.step3Title,config.macros.importTiddlers.step3Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	var listView = ListView.create(listWrapper,listedTiddlers,config.macros.importTiddlers.listViewTemplate);
+	wizard.setValue("listView",listView);
+	var txtSaveTiddler = wizard.getElement("txtSaveTiddler");
+	txtSaveTiddler.value = config.macros.importTiddlers.generateSystemServerName(wizard);
+	wizard.setButtons([
+			{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel},
+			{caption: config.macros.importTiddlers.importLabel, tooltip: config.macros.importTiddlers.importPrompt, onClick:  config.macros.importTiddlers.doImport}
+		]);
+};
+
+config.macros.importTiddlers.generateSystemServerName = function(wizard)
+{
+	var serverType = wizard.getValue("serverType");
+	var host = wizard.getValue("host");
+	var workspace = wizard.getValue("workspace");
+	var pattern = config.macros.importTiddlers[workspace ? "systemServerNamePattern" : "systemServerNamePatternNoWorkspace"];
+	return pattern.format([serverType,host,workspace]);
+};
+
+config.macros.importTiddlers.saveServerTiddler = function(wizard)
+{
+	var txtSaveTiddler = wizard.getElement("txtSaveTiddler").value;
+	if(store.tiddlerExists(txtSaveTiddler)) {
+		if(!confirm(config.macros.importTiddlers.confirmOverwriteSaveTiddler.format([txtSaveTiddler])))
+			return;
+		store.suspendNotifications();
+		store.removeTiddler(txtSaveTiddler);
+		store.resumeNotifications();
+	}
+	var serverType = wizard.getValue("serverType");
+	var host = wizard.getValue("host");
+	var workspace = wizard.getValue("workspace");
+	var text = config.macros.importTiddlers.serverSaveTemplate.format([serverType,host,workspace]);
+	store.saveTiddler(txtSaveTiddler,txtSaveTiddler,text,config.macros.importTiddlers.serverSaveModifier,new Date(),["systemServer"]);
+};
+
+config.macros.importTiddlers.doImport = function(e)
+{
+	var wizard = new Wizard(this);
+	if(wizard.getElement("chkSave").checked)
+		config.macros.importTiddlers.saveServerTiddler(wizard);
+	var chkSync = wizard.getElement("chkSync").checked;
+	wizard.setValue("sync",chkSync);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	var adaptor = wizard.getValue("adaptor");
+	var overwrite = new Array();
+	var t;
+	for(t=0; t<rowNames.length; t++) {
+		if(store.tiddlerExists(rowNames[t]))
+			overwrite.push(rowNames[t]);
+	}
+	if(overwrite.length > 0) {
+		if(!confirm(config.macros.importTiddlers.confirmOverwriteText.format([overwrite.join(", ")])))
+			return false;
+	}
+	wizard.addStep(config.macros.importTiddlers.step4Title.format([rowNames.length]),config.macros.importTiddlers.step4Html);
+	for(t=0; t<rowNames.length; t++) {
+		var link = document.createElement("div");
+		createTiddlyLink(link,rowNames[t],true);
+		var place = wizard.getElement("markReport");
+		place.parentNode.insertBefore(link,place);
+	}
+	wizard.setValue("remainingImports",rowNames.length);
+	wizard.setButtons([
+			{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}
+		],config.macros.importTiddlers.statusDoingImport);
+	for(t=0; t<rowNames.length; t++) {
+		var context = {};
+		context.allowSynchronous = true;
+		var inbound = adaptor.getTiddler(rowNames[t],context,wizard,config.macros.importTiddlers.onGetTiddler);
+	}
+	return false;
+};
+
+config.macros.importTiddlers.onGetTiddler = function(context,wizard)
+{
+	if(!context.status)
+		displayMessage("Error in importTiddlers.onGetTiddler: " + context.statusText);
+	var tiddler = context.tiddler;
+	store.suspendNotifications();
+	store.saveTiddler(tiddler.title, tiddler.title, tiddler.text, tiddler.modifier, tiddler.modified, tiddler.tags, tiddler.fields, true, tiddler.created);
+	if(!wizard.getValue("sync")) {
+		store.setValue(tiddler.title,'server',null);
+	}
+	store.resumeNotifications();
+	if(!context.isSynchronous) 
+		store.notify(tiddler.title,true);
+	var remainingImports = wizard.getValue("remainingImports")-1;
+	wizard.setValue("remainingImports",remainingImports);
+	if(remainingImports == 0) {
+		if(context.isSynchronous) {
+			store.notifyAll();
+			refreshDisplay();
+		}
+		wizard.setButtons([
+				{caption: config.macros.importTiddlers.doneLabel, tooltip: config.macros.importTiddlers.donePrompt, onClick: config.macros.importTiddlers.onCancel}
+			],config.macros.importTiddlers.statusDoneImport);
+		autoSaveChanges();
+	}
+};
+
+//--
+//-- Sync macro
+//--
+
+// Synchronisation handlers
+config.syncers = {};
+
+// Sync state.
+var currSync = null;
+
+// sync macro
+config.macros.sync.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!wikifier.isStatic)
+		this.startSync(place);
+};
+
+config.macros.sync.startSync = function(place)
+{
+	if(currSync)
+		config.macros.sync.cancelSync();
+	currSync = {};
+	currSync.syncList = this.getSyncableTiddlers();
+	this.createSyncTasks();
+	this.preProcessSyncableTiddlers();
+	var wizard = new Wizard();
+	currSync.wizard = wizard;
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	currSync.listView = ListView.create(listWrapper,currSync.syncList,this.listViewTemplate);
+	this.processSyncableTiddlers();
+	wizard.setButtons([
+			{caption: this.syncLabel, tooltip: this.syncPrompt, onClick: this.doSync}
+		]);
+};
+
+config.macros.sync.getSyncableTiddlers = function ()
+{
+	var list = [];
+	store.forEachTiddler(function(title,tiddler) {
+		var syncItem = {};
+		syncItem.serverType = tiddler.getServerType();
+		syncItem.serverHost = tiddler.fields['server.host'];
+		syncItem.serverWorkspace = tiddler.fields['server.workspace'];
+		syncItem.tiddler = tiddler;
+		syncItem.title = tiddler.title;
+		syncItem.isTouched = tiddler.isTouched();
+		syncItem.selected = syncItem.isTouched;
+		syncItem.syncStatus = config.macros.sync.syncStatusList[syncItem.isTouched ? "changedLocally" : "none"];
+		syncItem.status = syncItem.syncStatus.text;
+		if(syncItem.serverType && syncItem.serverHost)
+			list.push(syncItem);
+		});
+	list.sort(function(a,b) {return a.title < b.title ? -1 : (a.title == b.title ? 0 : +1);});
+	return list;
+};
+
+config.macros.sync.preProcessSyncableTiddlers = function()
+{
+	for(var t=0; t<currSync.syncList.length; t++) {
+		si = currSync.syncList[t];
+		var ti = si.syncTask.syncMachine.generateTiddlerInfo(si.tiddler);
+		si.serverUrl = ti.uri;
+	}
+};
+
+config.macros.sync.processSyncableTiddlers = function()
+{
+	for(var t=0; t<currSync.syncList.length; t++) {
+		si = currSync.syncList[t];
+		si.rowElement.style.backgroundColor = si.syncStatus.color;
+	}
+};
+
+config.macros.sync.createSyncTasks = function()
+{
+	currSync.syncTasks = [];
+	for(var t=0; t<currSync.syncList.length; t++) {
+		var si = currSync.syncList[t];
+		var r = null;
+		for(var st=0; st<currSync.syncTasks.length; st++) {
+			var cst = currSync.syncTasks[st];
+			if(si.serverType == cst.serverType && si.serverHost == cst.serverHost && si.serverWorkspace == cst.serverWorkspace)
+				r = cst;
+		}
+		if(r == null) {
+			si.syncTask = this.createSyncTask(si);
+			currSync.syncTasks.push(si.syncTask);
+		} else {
+			si.syncTask = r;
+			r.syncItems.push(si);
+		}
+	}
+};
+
+config.macros.sync.createSyncTask = function(syncItem)
+{
+	var st = {};
+	st.serverType = syncItem.serverType;
+	st.serverHost = syncItem.serverHost;
+	st.serverWorkspace = syncItem.serverWorkspace;
+	st.syncItems = [syncItem];
+	st.syncMachine = new SyncMachine(st.serverType,{
+		start: function() {
+			return this.openHost(st.serverHost,"openWorkspace");
+		},
+		openWorkspace: function() {
+			return this.openWorkspace(st.serverWorkspace,"getTiddlerList");
+		},
+		getTiddlerList: function() {
+			return this.getTiddlerList("gotTiddlerList");
+		},
+		gotTiddlerList: function(tiddlers) {
+			for(var t=0; t<st.syncItems.length; t++) {
+				var si = st.syncItems[t];
+				var f = tiddlers.findByField("title",si.title);
+				if(f !== null) {
+					if(tiddlers[f].fields['server.page.revision'] > si.tiddler.fields['server.page.revision']) {
+						si.syncStatus = config.macros.sync.syncStatusList[si.isTouched ? 'changedBoth' : 'changedServer'];
+					}
+				} else {
+					si.syncStatus = config.macros.sync.syncStatusList.notFound;
+				}
+				config.macros.sync.updateSyncStatus(si);
+			}
+		},
+		getTiddler: function(title) {
+			return this.getTiddler(title,"onGetTiddler");
+		},
+		onGetTiddler: function(tiddler) {
+			var syncItem = st.syncItems.findByField("title",tiddler.title);
+			if(syncItem !== null) {
+				syncItem = st.syncItems[syncItem];
+				store.saveTiddler(tiddler.title, tiddler.title, tiddler.text, tiddler.modifier, tiddler.modified, tiddler.tags, tiddler.fields, true, tiddler.created);
+				syncItem.syncStatus = config.macros.sync.syncStatusList.gotFromServer;
+				config.macros.sync.updateSyncStatus(syncItem);
+			}
+		},
+		putTiddler: function(tiddler) {
+			return this.putTiddler(tiddler,"onPutTiddler");
+		},
+		onPutTiddler: function(tiddler) {
+			var syncItem = st.syncItems.findByField("title",tiddler.title);
+			if(syncItem !== null) {
+				syncItem = st.syncItems[syncItem];
+				store.resetTiddler(tiddler.title);
+				syncItem.syncStatus = config.macros.sync.syncStatusList.putToServer;
+				config.macros.sync.updateSyncStatus(syncItem);
+			}
+		}
+	});
+	st.syncMachine.go();
+	return st;
+};
+
+config.macros.sync.updateSyncStatus = function(syncItem)
+{
+	var e = syncItem.colElements["status"];
+	removeChildren(e);
+	createTiddlyText(e,syncItem.syncStatus.text);
+	syncItem.rowElement.style.backgroundColor = syncItem.syncStatus.color;
+};
+
+config.macros.sync.doSync = function(e)
+{
+	var rowNames = ListView.getSelectedRows(currSync.listView);
+	for(var t=0; t<currSync.syncList.length; t++) {
+		var si = currSync.syncList[t];
+		if(rowNames.indexOf(si.title) != -1) {
+			config.macros.sync.doSyncItem(si);
+		}
+	}
+	return false;
+};
+
+config.macros.sync.doSyncItem = function(syncItem)
+{
+	var r = true;
+	var sl = config.macros.sync.syncStatusList;
+	switch(syncItem.syncStatus) {
+		case sl.changedServer:
+			r = syncItem.syncTask.syncMachine.go("getTiddler",syncItem.title);
+			break;
+		case sl.notFound:
+		case sl.changedLocally:
+		case sl.changedBoth:
+			r = syncItem.syncTask.syncMachine.go("putTiddler",syncItem.tiddler);
+			break;
+		default:
+			break;
+	}
+	if(r !== true)
+		displayMessage("Error in doSyncItem: " + r);
+};
+
+config.macros.sync.cancelSync = function()
+{
+	currSync = null;
+};
+
+function SyncMachine(serverType,steps)
+{
+	this.serverType = serverType;
+	this.adaptor = new config.adaptors[serverType];
+	this.steps = steps;
+}
+
+SyncMachine.prototype.go = function(step,varargs)
+{
+	if(!step)
+		step = "start";
+	var h = this.steps[step];
+	if(!h)
+		return null;
+	var a = [];
+	for(var t=1; t<arguments.length; t++)
+		a.push(arguments[t]);
+	var r = h.apply(this,a);
+	if(typeof r == "string")
+		this.invokeError(r);
+	return r;
+};
+
+SyncMachine.prototype.invokeError = function(message)
+{
+	if(this.steps.error)
+		this.steps.error(message);
+};
+
+SyncMachine.prototype.openHost = function(host,nextStep)
+{
+	var me = this;
+	return me.adaptor.openHost(host,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep);
+	});
+};
+
+SyncMachine.prototype.getWorkspaceList = function(nextStep)
+{
+	var me = this;
+	return me.adaptor.getWorkspaceList(null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,context.workspaces);
+	});
+};
+
+SyncMachine.prototype.openWorkspace = function(workspace,nextStep)
+{
+	var me = this;
+	return me.adaptor.openWorkspace(workspace,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep);
+	});
+};
+
+SyncMachine.prototype.getTiddlerList = function(nextStep)
+{
+	var me = this;
+	return me.adaptor.getTiddlerList(null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,context.tiddlers);
+	});
+};
+
+SyncMachine.prototype.generateTiddlerInfo = function(tiddler)
+{
+	return this.adaptor.generateTiddlerInfo(tiddler);
+};
+
+SyncMachine.prototype.getTiddler = function(title,nextStep)
+{
+	var me = this;
+	return me.adaptor.getTiddler(title,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,context.tiddler);
+	});
+};
+
+SyncMachine.prototype.putTiddler = function(tiddler,nextStep)
+{
+	var me = this;
+	return me.adaptor.putTiddler(tiddler,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,tiddler);
+	});
+};
+
+//--
+//-- Manager UI for groups of tiddlers
+//--
+
+config.macros.plugins.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var wizard = new Wizard();
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	listWrapper.setAttribute("refresh","macro");
+	listWrapper.setAttribute("macroName","plugins");
+	listWrapper.setAttribute("params",paramString);
+	this.refresh(listWrapper,paramString);
+};
+
+config.macros.plugins.refresh = function(listWrapper,params)
+{
+	var wizard = new Wizard(listWrapper);
+	var selectedRows = [];
+	ListView.forEachSelector(listWrapper,function(e,rowName) {
+			if(e.checked)
+				selectedRows.push(e.getAttribute("rowName"));
+		});
+	removeChildren(listWrapper);
+	params = params.parseParams("anon");
+	var plugins = installedPlugins.slice(0);
+	var t,tiddler,p;
+	var configTiddlers = store.getTaggedTiddlers("systemConfig");
+	for(t=0; t<configTiddlers.length; t++) {
+		tiddler = configTiddlers[t];
+		if(plugins.findByField("title",tiddler.title) == null) {
+			p = getPluginInfo(tiddler);
+			p.executed = false;
+			p.log.splice(0,0,this.skippedText);
+			plugins.push(p);
+		}
+	}
+	for(t=0; t<plugins.length; t++) {
+		p = plugins[t];
+		p.size = p.tiddler.text ? p.tiddler.text.length : 0;
+		p.forced = p.tiddler.isTagged("systemConfigForce");
+		p.disabled = p.tiddler.isTagged("systemConfigDisable");
+		p.Selected = selectedRows.indexOf(plugins[t].title) != -1;
+	}
+	if(plugins.length == 0) {
+		createTiddlyElement(listWrapper,"em",null,null,this.noPluginText);
+		wizard.setButtons([]);
+	} else {
+		var listView = ListView.create(listWrapper,plugins,this.listViewTemplate,this.onSelectCommand);
+		wizard.setValue("listView",listView);
+		wizard.setButtons([
+				{caption: config.macros.plugins.removeLabel, tooltip: config.macros.plugins.removePrompt, onClick:  config.macros.plugins.doRemoveTag},
+				{caption: config.macros.plugins.deleteLabel, tooltip: config.macros.plugins.deletePrompt, onClick:  config.macros.plugins.doDelete}
+			]);
+	}
+};
+
+config.macros.plugins.doRemoveTag = function(e)
+{
+	var wizard = new Wizard(this);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	if(rowNames.length == 0) {
+		alert(config.messages.nothingSelected);
+	} else {
+		for(var t=0; t<rowNames.length; t++)
+			store.setTiddlerTag(rowNames[t],false,"systemConfig");
+	}
+};
+
+config.macros.plugins.doDelete = function(e)
+{
+	var wizard = new Wizard(this);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	if(rowNames.length == 0) {
+		alert(config.messages.nothingSelected);
+	} else {
+		if(confirm(config.macros.plugins.confirmDeleteText.format([rowNames.join(", ")]))) {
+			for(t=0; t<rowNames.length; t++) {
+				store.removeTiddler(rowNames[t]);
+				story.closeTiddler(rowNames[t],true);
+			}
+		}
+	}
+};
+
+//--
+//-- Message area
+//--
+
+function getMessageDiv()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(!msgArea)
+		return null;
+	if(!msgArea.hasChildNodes())
+		createTiddlyButton(createTiddlyElement(msgArea,"div",null,"messageToolbar"),
+			config.messages.messageClose.text,
+			config.messages.messageClose.tooltip,
+			clearMessage);
+	msgArea.style.display = "block";
+	return createTiddlyElement(msgArea,"div");
+}
+
+function displayMessage(text,linkText)
+{
+	var e = getMessageDiv();
+	if(!e) {
+		alert(text);
+		return;
+	}
+	if(linkText) {
+		var link = createTiddlyElement(e,"a",null,null,text);
+		link.href = linkText;
+		link.target = "_blank";
+	} else {
+		e.appendChild(document.createTextNode(text));
+	}
+}
+
+function clearMessage()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(msgArea) {
+		removeChildren(msgArea);
+		msgArea.style.display = "none";
+	}
+	return false;
+}
+
+//--
+//-- Refresh mechanism
+//--
+
+config.refreshers = {
+	link: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddlyLink");
+		refreshTiddlyLink(e,title);
+		return true;
+		},
+	
+	tiddler: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var template = e.getAttribute("template");
+		if(changeList && changeList.indexOf(title) != -1 && !story.isDirty(title))
+			story.refreshTiddler(title,template,true);
+		else
+			refreshElements(e,changeList);
+		return true;
+		},
+
+	content: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var force = e.getAttribute("force");
+		if(force != null || changeList == null || changeList.indexOf(title) != -1) {
+			removeChildren(e);
+			wikify(store.getTiddlerText(title,title),e,null);
+			return true;
+		} else
+			return false;
+		},
+
+	macro: function(e,changeList)
+		{
+		var macro = e.getAttribute("macroName");
+		var params = e.getAttribute("params");
+		if(macro)
+			macro = config.macros[macro];
+		if(macro && macro.refresh)
+			macro.refresh(e,params);
+		return true;
+		}
+};
+
+function refreshElements(root,changeList)
+{
+	var nodes = root.childNodes;
+	for(var c=0; c<nodes.length; c++) {
+		var e = nodes[c], type = null;
+		if(e.getAttribute  && (e.tagName ? e.tagName != "IFRAME" : true))
+			type = e.getAttribute("refresh");
+		var refresher = config.refreshers[type];
+		var refreshed = false;
+		if(refresher != undefined)
+			refreshed = refresher(e,changeList);
+		if(e.hasChildNodes() && !refreshed)
+			refreshElements(e,changeList);
+	}
+}
+
+function applyHtmlMacros(root,tiddler)
+{
+	var e = root.firstChild;
+	while(e) {
+		var nextChild = e.nextSibling;
+		if(e.getAttribute) {
+			var macro = e.getAttribute("macro");
+			if(macro) {
+				var params = "";
+				var p = macro.indexOf(" ");
+				if(p != -1) {
+					params = macro.substr(p+1);
+					macro = macro.substr(0,p);
+				}
+				invokeMacro(e,macro,params,null,tiddler);
+			}
+		}
+		if(e.hasChildNodes())
+			applyHtmlMacros(e,tiddler);
+		e = nextChild;
+	}
+}
+
+function refreshPageTemplate(title)
+{
+	var stash = createTiddlyElement(document.body,"div");
+	stash.style.display = "none";
+	var display = document.getElementById("tiddlerDisplay");
+	var nodes,t;
+	if(display) {
+		nodes = display.childNodes;
+		for(t=nodes.length-1; t>=0; t--)
+			stash.appendChild(nodes[t]);
+	}
+	var wrapper = document.getElementById("contentWrapper");
+	if(!title)
+		title = "PageTemplate";
+	var html = store.getRecursiveTiddlerText(title,null,10);
+	wrapper.innerHTML = html;
+	applyHtmlMacros(wrapper);
+	refreshElements(wrapper);
+	display = document.getElementById("tiddlerDisplay");
+	removeChildren(display);
+	if(!display)
+		display = createTiddlyElement(wrapper,"div","tiddlerDisplay");
+	nodes = stash.childNodes;
+	for(t=nodes.length-1; t>=0; t--)
+		display.appendChild(nodes[t]);
+	removeNode(stash);
+}
+
+function refreshDisplay(hint)
+{
+	if(typeof hint == "string")
+		hint = [hint];
+	var e = document.getElementById("contentWrapper");
+	refreshElements(e,hint);
+	if(backstage.isPanelVisible()) {
+		e = document.getElementById("backstage");
+		refreshElements(e,hint);
+	}
+}
+
+function refreshPageTitle()
+{
+	document.title = getPageTitle();
+}
+
+function getPageTitle()
+{
+	var st = wikifyPlain("SiteTitle");
+	var ss = wikifyPlain("SiteSubtitle");
+	return st + ((st == "" || ss == "") ? "" : " - ") + ss;
+}
+
+function refreshStyles(title,doc)
+{
+	if(!doc)
+		doc = document;
+	setStylesheet(title == null ? "" : store.getRecursiveTiddlerText(title,"",10),title,doc);
+}
+
+function refreshColorPalette(title)
+{
+	if(!startingUp)
+		refreshAll();
+}
+
+function refreshAll()
+{
+	refreshPageTemplate();
+	refreshDisplay();
+	refreshStyles("StyleSheetLayout");
+	refreshStyles("StyleSheetColors");
+	refreshStyles("StyleSheet");
+	refreshStyles("StyleSheetPrint");
+}
+
+//--
+//-- Options cookie stuff
+//--
+
+config.optionHandlers = {
+	'txt': {
+		get: function(name) {return encodeCookie(config.options[name].toString());},
+		set: function(name,value) {config.options[name] = decodeCookie(value);}
+	},
+	'chk': {
+		get: function(name) {return config.options[name] ? "true" : "false";},
+		set: function(name,value) {config.options[name] = value == "true";}
+	}
+};
+
+function loadOptionsCookie()
+{
+	if(safeMode)
+		return;
+	var cookies = document.cookie.split(";");
+	for(var c=0; c<cookies.length; c++) {
+		var p = cookies[c].indexOf("=");
+		if(p != -1) {
+			var name = cookies[c].substr(0,p).trim();
+			var value = cookies[c].substr(p+1).trim();
+			var optType = name.substr(0,3);
+			if(config.optionHandlers[optType] && config.optionHandlers[optType].set)
+				config.optionHandlers[optType].set(name,value);
+		}
+	}
+}
+
+function saveOptionCookie(name)
+{
+	if(safeMode)
+		return;
+	var c = name + "=";
+	var optType = name.substr(0,3);
+	if(config.optionHandlers[optType] && config.optionHandlers[optType].get)
+		c += config.optionHandlers[optType].get(name);
+	c += "; expires=Fri, 1 Jan 2038 12:00:00 UTC; path=/";
+	document.cookie = c;
+}
+
+function encodeCookie(s)
+{
+	return escape(manualConvertUnicodeToUTF8(s));
+}
+
+function decodeCookie(s)
+{
+	s = unescape(s);
+	var re = /&#[0-9]{1,5};/g;
+	return s.replace(re,function($0) {return String.fromCharCode(eval($0.replace(/[&#;]/g,"")));});
+}
+
+//--
+//-- Saving
+//--
+
+var saveUsingSafari = false;
+
+var startSaveArea = '<div id="' + 'storeArea">'; // Split up into two so that indexOf() of this source doesn't find it
+var endSaveArea = '</d' + 'iv>';
+
+// If there are unsaved changes, force the user to confirm before exitting
+function confirmExit()
+{
+	hadConfirmExit = true;
+	if((store && store.isDirty && store.isDirty()) || (story && story.areAnyDirty && story.areAnyDirty()))
+		return config.messages.confirmExit;
+}
+
+// Give the user a chance to save changes before exitting
+function checkUnsavedChanges()
+{
+	if(store && store.isDirty && store.isDirty() && window.hadConfirmExit === false) {
+		if(confirm(config.messages.unsavedChangesWarning))
+			saveChanges();
+	}
+}
+
+function updateLanguageAttribute(s)
+{
+	if(config.locale) {
+		var mRE = /(<html(?:.*?)?)(?: xml:lang\="([a-z]+)")?(?: lang\="([a-z]+)")?>/;
+		var m = mRE.exec(s);
+		if(m) {
+			var t = m[1];
+			if(m[2])
+				t += ' xml:lang="' + config.locale + '"';
+			if(m[3])
+				t += ' lang="' + config.locale + '"';
+			t += ">";
+			s = s.substr(0,m.index) + t + s.substr(m.index+m[0].length);
+		}
+	}
+	return s;
+}
+
+function updateMarkupBlock(s,blockName,tiddlerName)
+{
+	return s.replaceChunk(
+			"<!--%0-START-->".format([blockName]),
+			"<!--%0-END-->".format([blockName]),
+			"\n" + store.getRecursiveTiddlerText(tiddlerName,"") + "\n");
+}
+
+function updateOriginal(original,posDiv)
+{
+	if(!posDiv)
+		posDiv = locateStoreArea(original);
+	if(!posDiv) {
+		alert(config.messages.invalidFileError.format([localPath]));
+		return null;
+	}
+	var revised = original.substr(0,posDiv[0] + startSaveArea.length) + "\n" +
+				convertUnicodeToUTF8(store.allTiddlersAsHtml()) + "\n" +
+				original.substr(posDiv[1]);
+	var newSiteTitle = convertUnicodeToUTF8(getPageTitle()).htmlEncode();
+	revised = revised.replaceChunk("<title"+">","</title"+">"," " + newSiteTitle + " ");
+	revised = updateLanguageAttribute(revised);
+	revised = updateMarkupBlock(revised,"PRE-HEAD","MarkupPreHead");
+	revised = updateMarkupBlock(revised,"POST-HEAD","MarkupPostHead");
+	revised = updateMarkupBlock(revised,"PRE-BODY","MarkupPreBody");
+	revised = updateMarkupBlock(revised,"POST-SCRIPT","MarkupPostBody");
+	return revised;
+}
+
+function locateStoreArea(original)
+{
+	// Locate the storeArea div's
+	var posOpeningDiv = original.indexOf(startSaveArea);
+	var limitClosingDiv = original.indexOf("<"+"!--POST-STOREAREA--"+">");
+	if(limitClosingDiv == -1)
+		limitClosingDiv = original.indexOf("<"+"!--POST-BODY-START--"+">");
+	var posClosingDiv = original.lastIndexOf(endSaveArea,limitClosingDiv == -1 ? original.length : limitClosingDiv);
+	return (posOpeningDiv != -1 && posClosingDiv != -1) ? [posOpeningDiv,posClosingDiv] : null;
+}
+
+function autoSaveChanges(onlyIfDirty,tiddlers)
+{
+	if(config.options.chkAutoSave)
+		saveChanges(onlyIfDirty,tiddlers);
+}
+
+// Save this tiddlywiki with the pending changes
+function saveChanges(onlyIfDirty,tiddlers)
+{
+	if(onlyIfDirty && !store.isDirty())
+		return;
+	clearMessage();
+	// Get the URL of the document
+	var originalPath = document.location.toString();
+	// Check we were loaded from a file URL
+	if(originalPath.substr(0,5) != "file:") {
+		alert(config.messages.notFileUrlError);
+		if(store.tiddlerExists(config.messages.saveInstructions))
+			story.displayTiddler(null,config.messages.saveInstructions);
+		return;
+	}
+	var localPath = getLocalPath(originalPath);
+	// Load the original file
+	var original = loadFile(localPath);
+	if(original == null) {
+		alert(config.messages.cantSaveError);
+		if(store.tiddlerExists(config.messages.saveInstructions))
+			story.displayTiddler(null,config.messages.saveInstructions);
+		return;
+	}
+	// Locate the storeArea div's
+	var posDiv = locateStoreArea(original);
+	if(!posDiv) {
+		alert(config.messages.invalidFileError.format([localPath]));
+		return;
+	}
+	saveBackup(localPath,original);
+	saveRss(localPath);
+	saveEmpty(localPath,original,posDiv);
+	saveMain(localPath,original,posDiv);
+}
+
+function saveBackup(localPath,original)
+{
+	// Save the backup
+	if(config.options.chkSaveBackups) {
+		var backupPath = getBackupPath(localPath);
+		var backup = config.browser.isIE ? ieCopyFile(backupPath,localPath) : saveFile(backupPath,original);
+		if(backup)
+			displayMessage(config.messages.backupSaved,"file://" + backupPath);
+		else
+			alert(config.messages.backupFailed);
+	}
+}
+
+function saveRss(localPath)
+{
+	if(config.options.chkGenerateAnRssFeed) {
+		var rssPath = localPath.substr(0,localPath.lastIndexOf(".")) + ".xml";
+		var rssSave = saveFile(rssPath,convertUnicodeToUTF8(generateRss()));
+		if(rssSave)
+			displayMessage(config.messages.rssSaved,"file://" + rssPath);
+		else
+			alert(config.messages.rssFailed);
+	}
+}
+
+function saveEmpty(localPath,original,posDiv)
+{
+	if(config.options.chkSaveEmptyTemplate) {
+		var emptyPath,p;
+		if((p = localPath.lastIndexOf("/")) != -1)
+			emptyPath = localPath.substr(0,p) + "/empty.html";
+		else if((p = localPath.lastIndexOf("\\")) != -1)
+			emptyPath = localPath.substr(0,p) + "\\empty.html";
+		else
+			emptyPath = localPath + ".empty.html";
+		var empty = original.substr(0,posDiv[0] + startSaveArea.length) + original.substr(posDiv[1]);
+		var emptySave = saveFile(emptyPath,empty);
+		if(emptySave)
+			displayMessage(config.messages.emptySaved,"file://" + emptyPath);
+		else
+			alert(config.messages.emptyFailed);
+	}
+}
+
+function saveMain(localPath,original,posDiv)
+{
+	var save;
+	try {
+		var revised = updateOriginal(original,posDiv);
+		save = saveFile(localPath,revised);
+	} catch (ex) {
+		showException(ex);
+	}
+	if(save) {
+		displayMessage(config.messages.mainSaved,"file://" + localPath);
+		store.setDirty(false);
+	} else {
+		alert(config.messages.mainFailed);
+	}
+}
+
+function getLocalPath(origPath)
+{
+	var originalPath = convertUriToUTF8(origPath,config.options.txtFileSystemCharSet);
+	// Remove any location or query part of the URL
+	var argPos = originalPath.indexOf("?");
+	if(argPos != -1)
+		originalPath = originalPath.substr(0,argPos);
+	var hashPos = originalPath.indexOf("#");
+	if(hashPos != -1)
+		originalPath = originalPath.substr(0,hashPos);
+	// Convert file://localhost/ to file:///
+	if(originalPath.indexOf("file://localhost/") == 0)
+		originalPath = "file://" + originalPath.substr(16);
+	// Convert to a native file format
+	var localPath;
+	if(originalPath.charAt(9) == ":") // pc local file
+		localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file://///") == 0) // FireFox pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file:///") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(7));
+	else if(originalPath.indexOf("file:/") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(5));
+	else // pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\\");
+	return localPath;
+}
+
+function getBackupPath(localPath)
+{
+	var backSlash = true;
+	var dirPathPos = localPath.lastIndexOf("\\");
+	if(dirPathPos == -1) {
+		dirPathPos = localPath.lastIndexOf("/");
+		backSlash = false;
+	}
+	var backupFolder = config.options.txtBackupFolder;
+	if(!backupFolder || backupFolder == "")
+		backupFolder = ".";
+	var backupPath = localPath.substr(0,dirPathPos) + (backSlash ? "\\" : "/") + backupFolder + localPath.substr(dirPathPos);
+	backupPath = backupPath.substr(0,backupPath.lastIndexOf(".")) + "." + (new Date()).convertToYYYYMMDDHHMMSSMMM() + ".html";
+	return backupPath;
+}
+
+function generateRss()
+{
+	var s = [];
+	var d = new Date();
+	var u = store.getTiddlerText("SiteUrl");
+	// Assemble the header
+	s.push("<" + "?xml version=\"1.0\"?" + ">");
+	s.push("<rss version=\"2.0\">");
+	s.push("<channel>");
+	s.push("<title" + ">" + wikifyPlain("SiteTitle").htmlEncode() + "</title" + ">");
+	if(u)
+		s.push("<link>" + u.htmlEncode() + "</link>");
+	s.push("<description>" + wikifyPlain("SiteSubtitle").htmlEncode() + "</description>");
+	s.push("<language>en-us</language>");
+	s.push("<copyright>Copyright " + d.getFullYear() + " " + config.options.txtUserName.htmlEncode() + "</copyright>");
+	s.push("<pubDate>" + d.toGMTString() + "</pubDate>");
+	s.push("<lastBuildDate>" + d.toGMTString() + "</lastBuildDate>");
+	s.push("<docs>http://blogs.law.harvard.edu/tech/rss</docs>");
+	s.push("<generator>TiddlyWiki " + version.major + "." + version.minor + "." + version.revision + "</generator>");
+	// The body
+	var tiddlers = store.getTiddlers("modified","excludeLists");
+	var n = config.numRssItems > tiddlers.length ? 0 : tiddlers.length-config.numRssItems;
+	for (var t=tiddlers.length-1; t>=n; t--)
+		s.push(tiddlers[t].saveToRss(u));
+	// And footer
+	s.push("</channel>");
+	s.push("</rss>");
+	// Save it all
+	return s.join("\n");
+}
+
+//--
+//-- Filesystem code
+//--
+
+function convertUTF8ToUnicode(u)
+{
+	if(window.netscape == undefined)
+		return manualConvertUTF8ToUnicode(u);
+	else
+		return mozConvertUTF8ToUnicode(u);
+}
+
+function manualConvertUTF8ToUnicode(utf)
+{
+	var uni = utf;
+	var src = 0;
+	var dst = 0;
+	var b1, b2, b3;
+	var c;
+	while(src < utf.length) {
+		b1 = utf.charCodeAt(src++);
+		if(b1 < 0x80) {
+			dst++;
+		} else if(b1 < 0xE0) {
+			b2 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0x1F) << 6) | (b2 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+		} else {
+			b2 = utf.charCodeAt(src++);
+			b3 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0xF) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+		}
+	}
+	return uni;
+}
+
+function mozConvertUTF8ToUnicode(u)
+{
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+	} catch(ex) {
+		return manualConvertUTF8ToUnicode(u);
+	} // fallback
+	var s = converter.ConvertToUnicode(u);
+	var fin = converter.Finish();
+	return (fin.length > 0) ? s+fin : s;
+}
+
+function convertUnicodeToUTF8(s)
+{
+	if(window.netscape == undefined)
+		return manualConvertUnicodeToUTF8(s);
+	else
+		return mozConvertUnicodeToUTF8(s);
+}
+
+function manualConvertUnicodeToUTF8(s)
+{
+	var re = /[^\u0000-\u007F]/g ;
+	return s.replace(re,function($0) {return "&#" + $0.charCodeAt(0).toString() + ";";});
+}
+
+function mozConvertUnicodeToUTF8(s)
+{
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+	} catch(ex) {
+		return manualConvertUnicodeToUTF8(s);
+	} // fallback
+	var u = converter.ConvertFromUnicode(s);
+	var fin = converter.Finish();
+	if(fin.length > 0)
+		return u + fin;
+	else
+		return u;
+}
+
+function convertUriToUTF8(uri,charSet)
+{
+	if(window.netscape == undefined || charSet == undefined || charSet == "")
+		return uri;
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/utf8converterservice;1"].getService(Components.interfaces.nsIUTF8ConverterService);
+	} catch(ex) {
+		return uri;
+	}
+	return converter.convertURISpecToUTF8(uri,charSet);
+}
+
+function saveFile(fileUrl,content)
+{
+	var r = null;
+	if(!r)
+		r = mozillaSaveFile(fileUrl,content);
+	if(!r)
+		r = ieSaveFile(fileUrl,content);
+	if(!r)
+		r = javaSaveFile(fileUrl,content);
+	return r;
+}
+
+function loadFile(fileUrl)
+{
+	var r = null;
+	if((r == null) || (r == false))
+		r = mozillaLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = ieLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = javaLoadFile(fileUrl);
+	return r;
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function ieSaveFile(filePath,content)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+	} catch(ex) {
+		return null;
+	}
+	var file = fso.OpenTextFile(filePath,2,-1,0);
+	file.Write(content);
+	file.Close();
+	return true;
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function ieLoadFile(filePath)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		var file = fso.OpenTextFile(filePath,1);
+		var content = file.ReadAll();
+		file.Close();
+	} catch(ex) {
+		return null;
+	}
+	return content;
+}
+
+function ieCopyFile(dest,source)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		fso.GetFile(source).Copy(dest);
+	} catch(ex) {
+		return false;
+	}
+	return true;
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function mozillaSaveFile(filePath,content)
+{
+	if(window.Components) {
+		try {
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if(!file.exists())
+				file.create(0,0664);
+			var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+			out.init(file,0x20|0x02,00004,null);
+			out.write(content,content.length);
+			out.flush();
+			out.close();
+			return true;
+		} catch(ex) {
+			return false;
+		}
+	}
+	return null;
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function mozillaLoadFile(filePath)
+{
+	if(window.Components) {
+		try {
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if(!file.exists())
+				return null;
+			var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+			inputStream.init(file,0x01,00004,null);
+			var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+			sInputStream.init(inputStream);
+			return sInputStream.read(sInputStream.available());
+		} catch(ex) {
+			return false;
+		}
+	}
+	return null;
+}
+
+function javaUrlToFilename(url)
+{
+	var f = "//localhost";
+	if(url.indexOf(f) == 0)
+		return url.substring(f.length);
+	var i = url.indexOf(":");
+	if(i > 0)
+		return url.substring(i-1);
+	return url;
+}
+
+function javaSaveFile(filePath,content)
+{
+	try {
+		if(document.applets["TiddlySaver"])
+			return document.applets["TiddlySaver"].saveFile(javaUrlToFilename(filePath),"UTF-8",content);
+	} catch(ex) {
+	}
+	try {
+		var s = new java.io.PrintStream(new java.io.FileOutputStream(javaUrlToFilename(filePath)));
+		s.print(content);
+		s.close();
+	} catch(ex) {
+		return null;
+	}
+	return true;
+}
+
+function javaLoadFile(filePath)
+{
+	try {
+		if(document.applets["TiddlySaver"])
+			return String(document.applets["TiddlySaver"].loadFile(javaUrlToFilename(filePath),"UTF-8"));
+	} catch(ex) {
+	}
+	var content = [];
+	try {
+		var r = new java.io.BufferedReader(new java.io.FileReader(javaUrlToFilename(filePath)));
+		var line;
+		while((line = r.readLine()) != null)
+			content.push(new String(line));
+		r.close();
+	} catch(ex) {
+		return null;
+	}
+	return content.join("\n");
+}
+
+//--
+//-- Server adaptor for talking to static files
+//--
+
+function FileAdaptor()
+{
+	this.host = null;
+	this.store = null;
+	return this;
+}
+
+FileAdaptor.NotLoadedError = "TiddlyWiki file has not been loaded";
+FileAdaptor.serverType = 'file';
+
+// Open the specified host/server
+FileAdaptor.prototype.openHost = function(host,context,userParams,callback)
+{
+	this.host = host;
+	if(!context)
+		context = {};
+	context.adaptor = this;
+	context.callback = callback;
+	context.userParams = userParams;
+	var ret = loadRemoteFile(host,FileAdaptor.openHostCallback,context);
+	return typeof(ret) == "string" ? ret : true;
+};
+
+FileAdaptor.openHostCallback = function(status,context,responseText,url,xhr)
+{
+	var adaptor = context.adaptor;
+	context.status = status;
+	if(!status) {
+		context.statusText = "Error reading file: " + xhr.statusText;
+	} else {
+		// Load the content into a TiddlyWiki() object
+		adaptor.store = new TiddlyWiki();
+		if(!adaptor.store.importTiddlyWiki(responseText))
+			context.statusText = config.messages.invalidFileError.format([url]);
+	}
+	context.callback(context,context.userParams);
+};
+
+// Gets the list of workspaces on a given server
+FileAdaptor.prototype.getWorkspaceList = function(context,userParams,callback)
+{
+	if(!context)
+		context = {};
+	context.workspaces = [{title:"(default)"}];
+	context.status = true;
+	window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
+// Open the specified workspace
+FileAdaptor.prototype.openWorkspace = function(workspace,context,userParams,callback)
+{
+	if(!context)
+		context = {};
+	context.status = true;
+	window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
+// Gets the list of tiddlers within a given workspace
+FileAdaptor.prototype.getTiddlerList = function(context,userParams,callback)
+{
+	if(!this.store)
+		return FileAdaptor.NotLoadedError;
+	if(!context)
+		context = {};
+	context.tiddlers = [];
+	this.store.forEachTiddler(function(title,tiddler)
+		{
+		var t = new Tiddler(title);
+		t.text = tiddler.text;
+		t.modified = tiddler.modified;
+		t.modifier = tiddler.modifier;
+		t.fields['server.page.revision'] = tiddler.modified.convertToYYYYMMDDHHMM();
+		t.tags = tiddler.tags;
+		context.tiddlers.push(t);
+		});
+	context.status = true;
+	window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
+FileAdaptor.prototype.generateTiddlerInfo = function(tiddler)
+{
+	var info = {};
+	info.uri = tiddler.fields['server.host'] + "#" + tiddler.title;
+	return info;
+};
+
+// Retrieves a tiddler from a given workspace on a given server
+FileAdaptor.prototype.getTiddler = function(title,context,userParams,callback)
+{
+	if(!this.store)
+		return FileAdaptor.NotLoadedError;
+	if(!context)
+		context = {};
+	context.tiddler = this.store.fetchTiddler(title);
+	if(context.tiddler) {
+		context.tiddler.fields['server.type'] = FileAdaptor.serverType;
+		context.tiddler.fields['server.host'] = this.host;
+		context.tiddler.fields['server.page.revision'] = context.tiddler.modified.convertToYYYYMMDDHHMM();
+	}
+	context.status = true;
+	if(context.allowSynchronous) {
+		context.isSynchronous = true;
+		callback(context,userParams);
+	} else {
+		window.setTimeout(function() {callback(context,userParams);},10);
+	}
+	return true;
+};
+
+FileAdaptor.prototype.close = function()
+{
+	delete this.store;
+	this.store = null;
+};
+
+config.adaptors[FileAdaptor.serverType] = FileAdaptor;
+
+//--
+//-- Remote HTTP requests
+//--
+
+function loadRemoteFile(url,callback,params)
+{
+	return doHttp("GET",url,null,null,null,null,callback,params,null);
+}
+
+// HTTP status codes
+var httpStatus = {
+	OK: 200,
+	ContentCreated: 201,
+	NoContent: 204,
+	Unauthorized: 401,
+	Forbidden: 403,
+	NotFound: 404,
+	MethodNotAllowed: 405
+};
+
+function doHttp(type,url,data,contentType,username,password,callback,params,headers)
+{
+	// Get an xhr object
+	var x = getXMLHttpRequest();
+	if(!x)
+		return "Can't create XMLHttpRequest object";
+	// Install callback
+	x.onreadystatechange = function() {
+		if (x.readyState == 4 && callback && (x.status !== undefined)) {
+			if([0, httpStatus.OK, httpStatus.ContentCreated, httpStatus.NoContent].contains(x.status))
+				callback(true,params,x.responseText,url,x);
+			else
+				callback(false,params,null,url,x);
+			x.onreadystatechange = function(){};
+			x = null;
+		}
+	};
+	// Send request
+	if(window.Components && window.netscape && window.netscape.security && document.location.protocol.indexOf("http") == -1)
+		window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+	try {
+		url = url + (url.indexOf("?") < 0 ? "?" : "&") + "nocache=" + Math.random();
+		x.open(type,url,true,username,password);
+		if (data)
+			x.setRequestHeader("Content-Type", contentType ? contentType : "application/x-www-form-urlencoded");
+		if (x.overrideMimeType)
+			x.setRequestHeader("Connection", "close");
+		if(headers) {
+			for(n in headers)
+				x.setRequestHeader(n,headers[n]);
+		}
+		x.setRequestHeader("X-Requested-With", "TiddlyWiki " + version.major + "." + version.minor + "." + version.revision + (version.beta ? " (beta " + version.beta + ")" : ""));
+		x.send(data);
+	} catch (ex) {
+		return exceptionText(ex);
+	}
+	return x;
+}
+
+function getXMLHttpRequest()
+{
+	try {
+		var x = new XMLHttpRequest(); // Modern
+	} catch(ex) {
+		try {
+			x = new ActiveXObject("Msxml2.XMLHTTP"); // IE 6
+		} catch (ex2) {
+			return null;
+		}
+	}
+	return x;
+}
+
+//--
+//-- TiddlyWiki-specific utility functions
+//--
+
+function createTiddlyButton(theParent,theText,theTooltip,theAction,theClass,theId,theAccessKey)
+{
+	var theButton = document.createElement("a");
+	if(theAction) {
+		theButton.onclick = theAction;
+		theButton.setAttribute("href","javascript:;");
+	}
+	if(theTooltip)
+		theButton.setAttribute("title",theTooltip);
+	if(theText)
+		theButton.appendChild(document.createTextNode(theText));
+	if(theClass)
+		theButton.className = theClass;
+	else
+		theButton.className = "button";
+	if(theId)
+		theButton.id = theId;
+	if(theParent)
+		theParent.appendChild(theButton);
+	if(theAccessKey)
+		theButton.setAttribute("accessKey",theAccessKey);
+	return theButton;
+}
+
+function createTiddlyLink(place,title,includeText,theClass,isStatic,linkedFromTiddler,noToggle)
+{
+	var text = includeText ? title : null;
+	var i = getTiddlyLinkInfo(title,theClass);
+	var btn = isStatic ? createExternalLink(place,store.getTiddlerText("SiteUrl",null) + "#" + title) : createTiddlyButton(place,text,i.subTitle,onClickTiddlerLink,i.classes);
+	btn.setAttribute("refresh","link");
+	btn.setAttribute("tiddlyLink",title);
+	if(noToggle)
+		btn.setAttribute("noToggle","true");
+	if(linkedFromTiddler) {
+		var fields = linkedFromTiddler.getInheritedFields();
+		if(fields)
+			btn.setAttribute("tiddlyFields",fields);
+	}
+	return btn;
+}
+
+function refreshTiddlyLink(e,title)
+{
+	var i = getTiddlyLinkInfo(title,e.className);
+	e.className = i.classes;
+	e.title = i.subTitle;
+}
+
+function getTiddlyLinkInfo(title,currClasses)
+{
+	var classes = currClasses ? currClasses.split(" ") : [];
+	classes.pushUnique("tiddlyLink");
+	var tiddler = store.fetchTiddler(title);
+	var subTitle;
+	if(tiddler) {
+		subTitle = tiddler.getSubtitle();
+		classes.pushUnique("tiddlyLinkExisting");
+		classes.remove("tiddlyLinkNonExisting");
+		classes.remove("shadow");
+	} else {
+		classes.remove("tiddlyLinkExisting");
+		classes.pushUnique("tiddlyLinkNonExisting");
+		if(store.isShadowTiddler(title)) {
+			subTitle = config.messages.shadowedTiddlerToolTip.format([title]);
+			classes.pushUnique("shadow");
+		} else {
+			subTitle = config.messages.undefinedTiddlerToolTip.format([title]);
+			classes.remove("shadow");
+		}
+	}
+	if(config.annotations[title])
+		subTitle = config.annotations[title];
+	return {classes: classes.join(" "),subTitle: subTitle};
+}
+
+function createExternalLink(place,url)
+{
+	var theLink = document.createElement("a");
+	theLink.className = "externalLink";
+	theLink.href = url;
+	theLink.title = config.messages.externalLinkTooltip.format([url]);
+	if(config.options.chkOpenInNewWindow)
+		theLink.target = "_blank";
+	place.appendChild(theLink);
+	return theLink;
+}
+
+// Event handler for clicking on a tiddly link
+function onClickTiddlerLink(e)
+{
+	if(!e) e = window.event;
+	var theTarget = resolveTarget(e);
+	var theLink = theTarget;
+	var title = null;
+	var fields = null;
+	var noToggle = null;
+	do {
+		title = theLink.getAttribute("tiddlyLink");
+		fields = theLink.getAttribute("tiddlyFields");
+		noToggle = theLink.getAttribute("noToggle");
+		theLink = theLink.parentNode;
+	} while(title == null && theLink != null);
+	if(!fields && !store.isShadowTiddler(title))
+		fields = String.encodeHashMap(config.defaultCustomFields);
+	if(title) {
+		var toggling = e.metaKey || e.ctrlKey;
+		if(config.options.chkToggleLinks)
+			toggling = !toggling;
+		if(noToggle)
+			toggling = false;
+		story.displayTiddler(theTarget,title,null,true,null,fields,toggling);
+	}
+	clearMessage();
+	return false;
+}
+
+// Create a button for a tag with a popup listing all the tiddlers that it tags
+function createTagButton(place,tag,excludeTiddler)
+{
+	var theTag = createTiddlyButton(place,tag,config.views.wikified.tag.tooltip.format([tag]),onClickTag);
+	theTag.setAttribute("tag",tag);
+	if(excludeTiddler)
+		theTag.setAttribute("tiddler",excludeTiddler);
+	return theTag;
+}
+
+// Event handler for clicking on a tiddler tag
+function onClickTag(e)
+{
+	if(!e) var e = window.event;
+	var theTarget = resolveTarget(e);
+	var popup = Popup.create(this);
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(popup && tag) {
+		var tagged = store.getTaggedTiddlers(tag);
+		var titles = [];
+		var li,r;
+		for(r=0;r<tagged.length;r++) {
+			if(tagged[r].title != title)
+				titles.push(tagged[r].title);
+		}
+		var lingo = config.views.wikified.tag;
+		if(titles.length > 0) {
+			var openAll = createTiddlyButton(createTiddlyElement(popup,"li"),lingo.openAllText.format([tag]),lingo.openAllTooltip,onClickTagOpenAll);
+			openAll.setAttribute("tag",tag);
+			createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+			for(r=0; r<titles.length; r++) {
+				createTiddlyLink(createTiddlyElement(popup,"li"),titles[r],true);
+			}
+		} else {
+			createTiddlyText(createTiddlyElement(popup,"li",null,"disabled"),lingo.popupNone.format([tag]));
+		}
+		createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+		var h = createTiddlyLink(createTiddlyElement(popup,"li"),tag,false);
+		createTiddlyText(h,lingo.openTag.format([tag]));
+	}
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+// Event handler for 'open all' on a tiddler popup
+function onClickTagOpenAll(e)
+{
+	if(!e) var e = window.event;
+	var tag = this.getAttribute("tag");
+	var tagged = store.getTaggedTiddlers(tag);
+	var titles = [];
+	for(var t=0; t<tagged.length; t++)
+		titles.push(tagged[t].title);
+	story.displayTiddlers(this,titles);
+	return false;
+}
+
+function onClickError(e)
+{
+	if(!e) var e = window.event;
+	var popup = Popup.create(this);
+	var lines = this.getAttribute("errorText").split("\n");
+	for(var t=0; t<lines.length; t++)
+		createTiddlyElement(popup,"li",null,null,lines[t]);
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+function createTiddlyDropDown(place,onchange,options,defaultValue)
+{
+	var sel = createTiddlyElement(place,"select");
+	sel.onchange = onchange;
+	for(var t=0; t<options.length; t++) {
+		var e = createTiddlyElement(sel,"option",null,null,options[t].caption);
+		e.value = options[t].name;
+		if(options[t].name == defaultValue)
+			e.selected = true;
+	}
+	return sel;
+}
+
+function createTiddlyPopup(place,caption,tooltip,tiddler)
+{
+	if(tiddler.text) {
+		createTiddlyLink(place,caption,true);
+		var btn = createTiddlyButton(place,glyph("downArrow"),tooltip,onClickTiddlyPopup,"tiddlerPopupButton");
+		btn.tiddler = tiddler;
+	} else {
+		createTiddlyText(place,caption);
+	}
+}
+
+function onClickTiddlyPopup(e)
+{
+	if(!e) var e = window.event;
+	var tiddler = this.tiddler;
+	if(tiddler.text) {
+		var popup = Popup.create(this,"div","popupTiddler");
+		wikify(tiddler.text,popup,null,tiddler);
+		Popup.show();
+	}
+	if(e) e.cancelBubble = true;
+	if(e && e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+function createTiddlyError(place,title,text)
+{
+	var btn = createTiddlyButton(place,title,null,onClickError,"errorButton");
+	if(text) btn.setAttribute("errorText",text);
+}
+
+function merge(dst,src,preserveExisting)
+{
+	for(p in src) {
+		if(!preserveExisting || dst[p] === undefined)
+			dst[p] = src[p];
+	}
+	return dst;
+}
+
+// Returns a string containing the description of an exception, optionally prepended by a message
+function exceptionText(e,message)
+{
+	var s = e.description ? e.description : e.toString();
+	return message ? "%0:\n%1".format([message,s]) : s;
+}
+
+// Displays an alert of an exception description with optional message
+function showException(e,message)
+{
+	alert(exceptionText(e,message));
+}
+
+function alertAndThrow(m)
+{
+	alert(m);
+	throw(m);
+}
+
+function glyph(name)
+{
+	var g = config.glyphs;
+	var b = g.currBrowser;
+	if(b == null) {
+		b = 0;
+		while(!g.browsers[b]() && b < g.browsers.length-1)
+			b++;
+		g.currBrowser = b;
+	}
+	if(!g.codes[name])
+		return "";
+	return g.codes[name][b];
+}
+//-
+//- Animation engine
+//-
+
+function Animator()
+{
+	this.running = 0; // Incremented at start of each animation, decremented afterwards. If zero, the interval timer is disabled
+	this.timerID = 0; // ID of the timer used for animating
+	this.animations = []; // List of animations in progress
+	return this;
+}
+
+// Start animation engine
+Animator.prototype.startAnimating = function() // Variable number of arguments
+{
+	for(var t=0; t<arguments.length; t++)
+		this.animations.push(arguments[t]);
+	if(this.running == 0) {
+		var me = this;
+		this.timerID = window.setInterval(function() {me.doAnimate(me);},10);
+	}
+	this.running += arguments.length;
+};
+
+// Perform an animation engine tick, calling each of the known animation modules
+Animator.prototype.doAnimate = function(me)
+{
+	var a = 0;
+	while(a < me.animations.length) {
+		var animation = me.animations[a];
+		if(animation.tick()) {
+			a++;
+		} else {
+			me.animations.splice(a,1);
+			if(--me.running == 0)
+				window.clearInterval(me.timerID);
+		}
+	}
+};
+
+// Map a 0..1 value to 0..1, but slow down at the start and end
+Animator.slowInSlowOut = function(progress)
+{
+	return(1-((Math.cos(progress * Math.PI)+1)/2));
+};
+
+//--
+//-- Morpher animation
+//--
+
+// Animate a set of properties of an element
+function Morpher(element,duration,properties,callback)
+{
+	this.element = element;
+	this.duration = duration;
+	this.properties = properties;
+	this.startTime = new Date();
+	this.endTime = Number(this.startTime) + duration;
+	this.callback = callback;
+	this.tick();
+	return this;
+}
+
+Morpher.prototype.assignStyle = function(element,style,value)
+{
+	switch(style) {
+		case "-tw-vertScroll":
+			window.scrollTo(findScrollX(),value);
+			break;
+		case "-tw-horizScroll":
+			window.scrollTo(value,findScrollY());
+			break;
+		default:
+			element.style[style] = value;
+			break;
+	}
+};
+
+Morpher.prototype.stop = function()
+{
+	for(var t=0; t<this.properties.length; t++) {
+		var p = this.properties[t];
+		if(p.atEnd !== undefined) {
+			this.assignStyle(this.element,p.style,p.atEnd);
+		}
+	}
+	if(this.callback)
+		this.callback(this.element,this.properties);
+};
+
+Morpher.prototype.tick = function()
+{
+	var currTime = Number(new Date());
+	progress = Animator.slowInSlowOut(Math.min(1,(currTime-this.startTime)/this.duration));
+	for(var t=0; t<this.properties.length; t++) {
+		var p = this.properties[t];
+		if(p.start !== undefined && p.end !== undefined) {
+			var template = p.template ? p.template : "%0";
+			switch(p.format) {
+				case undefined:
+				case "style":
+					var v = p.start + (p.end-p.start) * progress;
+					this.assignStyle(this.element,p.style,template.format([v]));
+					break;
+				case "color":
+					break;
+			}
+		}
+	}
+	if(currTime >= this.endTime) {
+		this.stop();
+		return false;
+	}
+	return true;
+};
+
+//--
+//-- Zoomer animation
+//--
+
+function Zoomer(text,startElement,targetElement,unused)
+{
+	var e = createTiddlyElement(document.body,"div",null,"zoomer");
+	createTiddlyElement(e,"div",null,null,text);
+	var winWidth = findWindowWidth();
+	var winHeight = findWindowHeight();
+	var p = [
+		{style: 'left', start: findPosX(startElement), end: findPosX(targetElement), template: '%0px'},
+		{style: 'top', start: findPosY(startElement), end: findPosY(targetElement), template: '%0px'},
+		{style: 'width', start: Math.min(startElement.scrollWidth,winWidth), end: Math.min(targetElement.scrollWidth,winWidth), template: '%0px', atEnd: 'auto'},
+		{style: 'height', start: Math.min(startElement.scrollHeight,winHeight), end: Math.min(targetElement.scrollHeight,winHeight), template: '%0px', atEnd: 'auto'},
+		{style: 'fontSize', start: 8, end: 24, template: '%0pt'}
+	];
+	var c = function(element,properties) {removeNode(element);};
+	return new Morpher(e,config.animDuration,p,c);
+}
+
+//--
+//-- Scroller animation
+//--
+
+function Scroller(targetElement,unused)
+{
+	var p = [
+		{style: '-tw-vertScroll', start: findScrollY(), end: ensureVisible(targetElement)}
+	];
+	return new Morpher(targetElement,config.animDuration,p);
+}
+
+//--
+//-- Slider animation
+//--
+
+// deleteMode - "none", "all" [delete target element and it's children], [only] "children" [but not the target element]
+function Slider(element,opening,unused,deleteMode)
+{
+	element.style.overflow = 'hidden';
+	if(opening)
+		element.style.height = '0px'; // Resolves a Firefox flashing bug
+	element.style.display = 'block';
+	var left = findPosX(element);
+	var width = element.scrollWidth;
+	var height = element.scrollHeight;
+	var winWidth = findWindowWidth();
+	var p = [];
+	var c = null;
+	if(opening) {
+		p.push({style: 'height', start: 0, end: height, template: '%0px', atEnd: 'auto'});
+		p.push({style: 'opacity', start: 0, end: 1, template: '%0'});
+		p.push({style: 'filter', start: 0, end: 100, template: 'alpha(opacity:%0)'});
+	} else {
+		p.push({style: 'height', start: height, end: 0, template: '%0px'});
+		p.push({style: 'display', atEnd: 'none'});
+		p.push({style: 'opacity', start: 1, end: 0, template: '%0'});
+		p.push({style: 'filter', start: 100, end: 0, template: 'alpha(opacity:%0)'});
+		switch(deleteMode) {
+			case "all":
+				c = function(element,properties) {removeNode(element);};
+				break;
+			case "children":
+				c = function(element,properties) {removeChildren(element);};
+				break;
+		}
+	}
+	return new Morpher(element,config.animDuration,p,c);
+}
+
+//--
+//-- Popup menu
+//--
+
+var Popup = {
+	stack: [] // Array of objects with members root: and popup:
+	};
+
+Popup.create = function(root,elem,theClass)
+{
+	Popup.remove();
+	var popup = createTiddlyElement(document.body,elem ? elem : "ol","popup",theClass ? theClass : "popup");
+	Popup.stack.push({root: root, popup: popup});
+	return popup;
+};
+
+Popup.onDocumentClick = function(e)
+{
+	if (!e) var e = window.event;
+	var target = resolveTarget(e);
+	if(e.eventPhase == undefined)
+		Popup.remove();
+	else if(e.eventPhase == Event.BUBBLING_PHASE || e.eventPhase == Event.AT_TARGET)
+		Popup.remove();
+	return true;
+};
+
+Popup.show = function(unused1,unused2)
+{
+	var curr = Popup.stack[Popup.stack.length-1];
+	this.place(curr.root,curr.popup);
+	addClass(curr.root,"highlight");
+	if(config.options.chkAnimate && anim && typeof Scroller == "function")
+		anim.startAnimating(new Scroller(curr.popup));
+	else
+		window.scrollTo(0,ensureVisible(curr.popup));
+};
+
+Popup.place = function(root,popup,offset)
+{
+	if(!offset) var offset = {x:0, y:0};
+	var rootLeft = findPosX(root);
+	var rootTop = findPosY(root);
+	var rootHeight = root.offsetHeight;
+	var popupLeft = rootLeft + offset.x;
+	var popupTop = rootTop + rootHeight + offset.y;
+	var winWidth = findWindowWidth();
+	if(popup.offsetWidth > winWidth*0.75)
+		popup.style.width = winWidth*0.75 + "px";
+	var popupWidth = popup.offsetWidth;
+	if(popupLeft + popupWidth > winWidth)
+		popupLeft = winWidth - popupWidth;
+	popup.style.left = popupLeft + "px";
+	popup.style.top = popupTop + "px";
+	popup.style.display = "block";
+}
+
+Popup.remove = function()
+{
+	if(Popup.stack.length > 0) {
+		Popup.removeFrom(0);
+	}
+};
+
+Popup.removeFrom = function(from)
+{
+	for(var t=Popup.stack.length-1; t>=from; t--) {
+		var p = Popup.stack[t];
+		removeClass(p.root,"highlight");
+		removeNode(p.popup);
+	}
+	Popup.stack = Popup.stack.slice(0,from);
+};
+
+//--
+//-- Wizard support
+//--
+
+function Wizard(elem)
+{
+	if(elem) {
+		this.formElem = findRelated(elem,"wizard","className");
+		this.bodyElem = findRelated(this.formElem.firstChild,"wizardBody","className","nextSibling");
+		this.footElem = findRelated(this.formElem.firstChild,"wizardFooter","className","nextSibling");
+	} else {
+		this.formElem = null;
+		this.bodyElem = null;
+		this.footElem = null;
+	}
+}
+
+Wizard.prototype.setValue = function(name,value)
+{
+	if(this.formElem)
+		this.formElem[name] = value;
+};
+
+Wizard.prototype.getValue = function(name)
+{
+	return this.formElem ? this.formElem[name] : null;
+};
+
+Wizard.prototype.createWizard = function(place,title)
+{
+	this.formElem = createTiddlyElement(place,"form",null,"wizard");
+	createTiddlyElement(this.formElem,"h1",null,null,title);
+	this.bodyElem = createTiddlyElement(this.formElem,"div",null,"wizardBody");
+	this.footElem = createTiddlyElement(this.formElem,"div",null,"wizardFooter");
+};
+
+Wizard.prototype.clear = function()
+{
+	removeChildren(this.bodyElem);
+};
+
+Wizard.prototype.setButtons = function(buttonInfo,status)
+{
+	removeChildren(this.footElem);
+	for(var t=0; t<buttonInfo.length; t++) {
+		createTiddlyButton(this.footElem,buttonInfo[t].caption,buttonInfo[t].tooltip,buttonInfo[t].onClick);
+		insertSpacer(this.footElem);
+		}
+	if(typeof status == "string") {
+		createTiddlyElement(this.footElem,"span",null,"status",status);
+	}
+};
+
+Wizard.prototype.addStep = function(stepTitle,html)
+{
+	removeChildren(this.bodyElem);
+	var w = createTiddlyElement(this.bodyElem,"div");
+	createTiddlyElement(w,"h2",null,null,stepTitle);
+	var step = createTiddlyElement(w,"div",null,"wizardStep");
+	step.innerHTML = html;
+	applyHtmlMacros(step,tiddler);
+};
+
+Wizard.prototype.getElement = function(name)
+{
+	return this.formElem.elements[name];
+};
+
+//--
+//-- ListView gadget
+//--
+
+var ListView = {};
+
+// Create a listview
+ListView.create = function(place,listObject,listTemplate,callback,className)
+{
+	var table = createTiddlyElement(place,"table",null,className ? className : "listView twtable");
+	var thead = createTiddlyElement(table,"thead");
+	var r = createTiddlyElement(thead,"tr");
+	for(var t=0; t<listTemplate.columns.length; t++) {
+		var columnTemplate = listTemplate.columns[t];
+		var c = createTiddlyElement(r,"th");
+		var colType = ListView.columnTypes[columnTemplate.type];
+		if(colType && colType.createHeader)
+			colType.createHeader(c,columnTemplate,t);
+	}
+	var tbody = createTiddlyElement(table,"tbody");
+	for(var rc=0; rc<listObject.length; rc++) {
+		rowObject = listObject[rc];
+		r = createTiddlyElement(tbody,"tr");
+		for(c=0; c<listTemplate.rowClasses.length; c++) {
+			if(rowObject[listTemplate.rowClasses[c].field])
+				addClass(r,listTemplate.rowClasses[c].className);
+		}
+		rowObject.rowElement = r;
+		rowObject.colElements = {};
+		for(var cc=0; cc<listTemplate.columns.length; cc++) {
+			c = createTiddlyElement(r,"td");
+			columnTemplate = listTemplate.columns[cc];
+			var field = columnTemplate.field;
+			colType = ListView.columnTypes[columnTemplate.type];
+			if(colType && colType.createItem)
+				colType.createItem(c,rowObject,field,columnTemplate,cc,rc);
+			rowObject.colElements[field] = c;
+		}
+	}
+	if(callback && listTemplate.actions)
+		createTiddlyDropDown(place,ListView.getCommandHandler(callback),listTemplate.actions);
+	if(callback && listTemplate.buttons) {
+		for(t=0; t<listTemplate.buttons.length; t++) {
+			var a = listTemplate.buttons[t];
+			if(a && a.name != "")
+				createTiddlyButton(place,a.caption,null,ListView.getCommandHandler(callback,a.name,a.allowEmptySelection));
+		}
+	}
+	return table;
+};
+
+ListView.getCommandHandler = function(callback,name,allowEmptySelection)
+{
+	return function(e) {
+		var view = findRelated(this,"TABLE",null,"previousSibling");
+		var tiddlers = [];
+		ListView.forEachSelector(view,function(e,rowName) {
+					if(e.checked)
+						tiddlers.push(rowName);
+					});
+		if(tiddlers.length == 0 && !allowEmptySelection) {
+			alert(config.messages.nothingSelected);
+		} else {
+			if(this.nodeName.toLowerCase() == "select") {
+				callback(view,this.value,tiddlers);
+				this.selectedIndex = 0;
+			} else {
+				callback(view,name,tiddlers);
+			}
+		}
+	};
+};
+
+// Invoke a callback for each selector checkbox in the listview
+ListView.forEachSelector = function(view,callback)
+{
+	var checkboxes = view.getElementsByTagName("input");
+	var hadOne = false;
+	for(var t=0; t<checkboxes.length; t++) {
+		var cb = checkboxes[t];
+		if(cb.getAttribute("type") == "checkbox") {
+			var rn = cb.getAttribute("rowName");
+			if(rn) {
+				callback(cb,rn);
+				hadOne = true;
+			}
+		}
+	}
+	return hadOne;
+};
+
+ListView.getSelectedRows = function(view)
+{
+	var rowNames = [];
+	ListView.forEachSelector(view,function(e,rowName) {
+				if(e.checked)
+					rowNames.push(rowName);
+				});
+	return rowNames;
+};
+
+ListView.columnTypes = {};
+
+ListView.columnTypes.String = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyText(place,columnTemplate.title);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v);
+		}
+};
+
+ListView.columnTypes.WikiText = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				wikify(v,place,null,null);
+		}
+};
+
+ListView.columnTypes.Tiddler = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined && v.title)
+				createTiddlyPopup(place,v.title,config.messages.listView.tiddlerTooltip,v);
+		}
+};
+
+ListView.columnTypes.Size = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				var t = 0;
+				while(t<config.messages.sizeTemplates.length-1 && v<config.messages.sizeTemplates[t].unit)
+					t++;
+				createTiddlyText(place,config.messages.sizeTemplates[t].template.format([Math.round(v/config.messages.sizeTemplates[t].unit)]));
+			}
+		}
+};
+
+ListView.columnTypes.Link = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			var c = columnTemplate.text;
+			if(v != undefined)
+				createTiddlyText(createExternalLink(place,v),c ? c : v);
+		}
+};
+
+ListView.columnTypes.Date = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v.formatString(columnTemplate.dateFormat));
+		}
+};
+
+ListView.columnTypes.StringList = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				for(var t=0; t<v.length; t++) {
+					createTiddlyText(place,v[t]);
+					createTiddlyElement(place,"br");
+				}
+			}
+		}
+};
+
+ListView.columnTypes.Selector = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyCheckbox(place,null,false,this.onHeaderChange);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],null);
+			e.setAttribute("rowName",listObject[columnTemplate.rowName]);
+		},
+	onHeaderChange: function(e)
+		{
+			var state = this.checked;
+			var view = findRelated(this,"TABLE");
+			if(!view)
+				return;
+			ListView.forEachSelector(view,function(e,rowName) {
+								e.checked = state;
+							});
+		}
+};
+
+ListView.columnTypes.Tags = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var tags = listObject[field];
+			createTiddlyText(place,String.encodeTiddlyLinkList(tags));
+		}
+};
+
+ListView.columnTypes.Boolean = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			if(listObject[field] == true)
+				createTiddlyText(place,columnTemplate.trueText);
+			if(listObject[field] == false)
+				createTiddlyText(place,columnTemplate.falseText);
+		}
+};
+
+ListView.columnTypes.TagCheckbox = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],this.onChange);
+			e.setAttribute("tiddler",listObject.title);
+			e.setAttribute("tag",columnTemplate.tag);
+		},
+	onChange : function(e)
+		{
+			var tag = this.getAttribute("tag");
+			var tiddler = this.getAttribute("tiddler");
+			store.setTiddlerTag(tiddler,this.checked,tag);
+		}
+};
+
+ListView.columnTypes.TiddlerLink = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				var link = createTiddlyLink(place,listObject[columnTemplate.tiddlerLink],false,null);
+				createTiddlyText(link,listObject[field]);
+			}
+		}
+};
+
+//--
+//-- Augmented methods for the JavaScript Number(), Array(), String() and Date() objects
+//--
+
+// Clamp a number to a range
+Number.prototype.clamp = function(min,max)
+{
+	var c = this;
+	if(c < min)
+		c = min;
+	if(c > max)
+		c = max;
+	return c;
+};
+
+// Add indexOf function if browser does not support it
+if(!Array.indexOf) {
+Array.prototype.indexOf = function(item,from)
+{
+	if(!from)
+		from = 0;
+	for(var i=from; i<this.length; i++) {
+		if(this[i] === item)
+			return i;
+	}
+	return -1;
+};}
+
+// Find an entry in a given field of the members of an array
+Array.prototype.findByField = function(field,value)
+{
+	for(var t=0; t<this.length; t++) {
+		if(this[t][field] == value)
+			return t;
+	}
+	return null;
+};
+
+// Return whether an entry exists in an array
+Array.prototype.contains = function(item)
+{
+	return this.indexOf(item) != -1;
+};
+
+// Adds, removes or toggles a particular value within an array
+//  value - value to add
+//  mode - +1 to add value, -1 to remove value, 0 to toggle it
+Array.prototype.setItem = function(value,mode)
+{
+	var p = this.indexOf(value);
+	if(mode == 0)
+		mode = (p == -1) ? +1 : -1;
+	if(mode == +1) {
+		if(p == -1)
+			this.push(value);
+	} else if(mode == -1) {
+		if(p != -1)
+			this.splice(p,1);
+	}
+};
+
+// Return whether one of a list of values exists in an array
+Array.prototype.containsAny = function(items)
+{
+	for(var i=0; i<items.length; i++) {
+		if (this.indexOf(items[i]) != -1)
+			return true;
+	}
+	return false;
+};
+
+// Return whether all of a list of values exists in an array
+Array.prototype.containsAll = function(items)
+{
+	for (var i = 0; i<items.length; i++) {
+		if (this.indexOf(items[i]) == -1)
+			return false;
+	}
+	return true;
+};
+
+// Push a new value into an array only if it is not already present in the array. If the optional unique parameter is false, it reverts to a normal push
+Array.prototype.pushUnique = function(item,unique)
+{
+	if(unique === false) {
+		this.push(item);
+	} else {
+		if(this.indexOf(item) == -1)
+			this.push(item);
+	}
+};
+
+Array.prototype.remove = function(item)
+{
+	var p = this.indexOf(item);
+	if(p != -1)
+		this.splice(p,1);
+};
+
+// Get characters from the right end of a string
+String.prototype.right = function(n)
+{
+	return n < this.length ? this.slice(this.length-n) : this;
+};
+
+// Trim whitespace from both ends of a string
+String.prototype.trim = function()
+{
+	return this.replace(/^\s*|\s*$/g,"");
+};
+
+// Convert a string from a CSS style property name to a JavaScript style name ("background-color" -> "backgroundColor")
+String.prototype.unDash = function()
+{
+	var s = this.split("-");
+	if(s.length > 1) {
+		for(var t=1; t<s.length; t++)
+			s[t] = s[t].substr(0,1).toUpperCase() + s[t].substr(1);
+	}
+	return s.join("");
+};
+
+// Substitute substrings from an array into a format string that includes '%1'-type specifiers
+String.prototype.format = function(substrings)
+{
+	var subRegExp = /(?:%(\d+))/mg;
+	var currPos = 0;
+	var r = [];
+	do {
+		var match = subRegExp.exec(this);
+		if(match && match[1]) {
+			if(match.index > currPos)
+				r.push(this.substring(currPos,match.index));
+			r.push(substrings[parseInt(match[1])]);
+			currPos = subRegExp.lastIndex;
+		}
+	} while(match);
+	if(currPos < this.length)
+		r.push(this.substring(currPos,this.length));
+	return r.join("");
+};
+
+// Escape any special RegExp characters with that character preceded by a backslash
+String.prototype.escapeRegExp = function()
+{
+	var s = "\\^$*+?()=!|,{}[].";
+	var c = this;
+	for(var t=0; t<s.length; t++)
+		c = c.replace(new RegExp("\\" + s.substr(t,1),"g"),"\\" + s.substr(t,1));
+	return c;
+};
+
+// Convert "\" to "\s", newlines to "\n" (and remove carriage returns)
+String.prototype.escapeLineBreaks = function()
+{
+	return this.replace(/\\/mg,"\\s").replace(/\n/mg,"\\n").replace(/\r/mg,"");
+};
+
+// Convert "\n" to newlines, "\b" to " ", "\s" to "\" (and remove carriage returns)
+String.prototype.unescapeLineBreaks = function()
+{
+	return this.replace(/\\n/mg,"\n").replace(/\\b/mg," ").replace(/\\s/mg,"\\").replace(/\r/mg,"");
+};
+
+// Convert & to "&amp;", < to "&lt;", > to "&gt;" and " to "&quot;"
+String.prototype.htmlEncode = function()
+{
+	return this.replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;").replace(/\"/mg,"&quot;");
+};
+
+// Convert "&amp;" to &, "&lt;" to <, "&gt;" to > and "&quot;" to "
+String.prototype.htmlDecode = function()
+{
+	return this.replace(/&lt;/mg,"<").replace(/&gt;/mg,">").replace(/&quot;/mg,"\"").replace(/&amp;/mg,"&");
+};
+
+// Convert a string to it's JSON representation by encoding control characters, double quotes and backslash. See json.org
+String.prototype.toJSONString = function()
+{
+	var m = {
+		'\b': '\\b',
+		'\f': '\\f',
+		'\n': '\\n',
+		'\r': '\\r',
+		'\t': '\\t',
+		'"' : '\\"',
+		'\\': '\\\\'
+		};
+	var replaceFn = function(a,b) {
+		var c = m[b];
+		if(c)
+			return c;
+		c = b.charCodeAt();
+		return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16);
+		};
+	if(/["\\\x00-\x1f]/.test(this))
+		return '"' + this.replace(/([\x00-\x1f\\"])/g,replaceFn) + '"';
+	return '"' + this + '"';
+};
+
+// Parse a space-separated string of name:value parameters
+// The result is an array of objects:
+//   result[0] = object with a member for each parameter name, value of that member being an array of values
+//   result[1..n] = one object for each parameter, with 'name' and 'value' members
+String.prototype.parseParams = function(defaultName,defaultValue,allowEval,noNames,cascadeDefaults)
+{
+	var parseToken = function(match,p) {
+		var n;
+		if(match[p]) // Double quoted
+			n = match[p];
+		else if(match[p+1]) // Single quoted
+			n = match[p+1];
+		else if(match[p+2]) // Double-square-bracket quoted
+			n = match[p+2];
+		else if(match[p+3]) // Double-brace quoted
+			try {
+				n = match[p+3];
+				if(allowEval)
+					n = window.eval(n);
+			} catch(ex) {
+				throw "Unable to evaluate {{" + match[p+3] + "}}: " + exceptionText(ex);
+			}
+		else if(match[p+4]) // Unquoted
+			n = match[p+4];
+		else if(match[p+5]) // empty quote
+			n = "";
+		return n;
+	};
+	var r = [{}];
+	var dblQuote = "(?:\"((?:(?:\\\\\")|[^\"])+)\")";
+	var sngQuote = "(?:'((?:(?:\\\\\')|[^'])+)')";
+	var dblSquare = "(?:\\[\\[((?:\\s|\\S)*?)\\]\\])";
+	var dblBrace = "(?:\\{\\{((?:\\s|\\S)*?)\\}\\})";
+	var unQuoted = noNames ? "([^\"'\\s]\\S*)" : "([^\"':\\s][^\\s:]*)";
+	var emptyQuote = "((?:\"\")|(?:''))";
+	var skipSpace = "(?:\\s*)";
+	var token = "(?:" + dblQuote + "|" + sngQuote + "|" + dblSquare + "|" + dblBrace + "|" + unQuoted + "|" + emptyQuote + ")";
+	var re = noNames ? new RegExp(token,"mg") : new RegExp(skipSpace + token + skipSpace + "(?:(\\:)" + skipSpace + token + ")?","mg");
+	var params = [];
+	do {
+		var match = re.exec(this);
+		if(match) {
+			var n = parseToken(match,1);
+			if(noNames) {
+				r.push({name:"",value:n});
+			} else {
+				var v = parseToken(match,8);
+				if(v == null && defaultName) {
+					v = n;
+					n = defaultName;
+				} else if(v == null && defaultValue) {
+					v = defaultValue;
+				}
+				r.push({name:n,value:v});
+				if(cascadeDefaults) {
+					defaultName = n;
+					defaultValue = v;
+				}
+			}
+		}
+	} while(match);
+	// Summarise parameters into first element
+	for(var t=1; t<r.length; t++) {
+		if(r[0][r[t].name])
+			r[0][r[t].name].push(r[t].value);
+		else
+			r[0][r[t].name] = [r[t].value];
+	}
+	return r;
+};
+
+// Process a string list of macro parameters into an array. Parameters can be quoted with "", '',
+// [[]], {{ }} or left unquoted (and therefore space-separated). Double-braces {{}} results in
+// an *evaluated* parameter: e.g. {{config.options.txtUserName}} results in the current user's name.
+String.prototype.readMacroParams = function()
+{
+	var p = this.parseParams("list",null,true,true);
+	var n = [];
+	for(var t=1; t<p.length; t++)
+		n.push(p[t].value);
+	return n;
+};
+
+// Process a string list of unique tiddler names into an array. Tiddler names that have spaces in them must be [[bracketed]]
+String.prototype.readBracketedList = function(unique)
+{
+	var p = this.parseParams("list",null,false,true);
+	var n = [];
+	for(var t=1; t<p.length; t++)
+		n.pushUnique(p[t].value,unique);
+	return n;
+};
+
+// Returns array with start and end index of chunk between given start and end marker, or undefined.
+String.prototype.getChunkRange = function(start,end) 
+{
+	var s = this.indexOf(start);
+	if(s != -1) {
+		s += start.length;
+		var e = this.indexOf(end,s);
+		if(e != -1)
+			return [s,e];
+	}
+};
+
+// Replace a chunk of a string given start and end markers
+String.prototype.replaceChunk = function(start,end,sub)
+{
+	var r = this.getChunkRange(start,end);
+	return r ? this.substring(0,r[0]) + sub + this.substring(r[1]) : this;
+};
+
+// Returns a chunk of a string between start and end markers, or undefined
+String.prototype.getChunk = function(start,end)
+{
+	var r = this.getChunkRange(start,end);
+	if(r)
+		return this.substring(r[0],r[1]);
+};
+
+
+// Static method to bracket a string with double square brackets if it contains a space
+String.encodeTiddlyLink = function(title)
+{
+	return title.indexOf(" ") == -1 ? title : "[[" + title + "]]";
+};
+
+// Static method to encodeTiddlyLink for every item in an array and join them with spaces
+String.encodeTiddlyLinkList = function(list)
+{
+	if(list) {
+		var results = [];
+		for(var t=0; t<list.length; t++)
+			results.push(String.encodeTiddlyLink(list[t]));
+		return results.join(" ");
+	} else {
+		return "";
+	}
+};
+
+// Convert a string as a sequence of name:"value" pairs into a hashmap
+String.prototype.decodeHashMap = function()
+{
+	var fields = this.parseParams("anon","",false);
+	var r = {};
+	for(var t=1; t<fields.length; t++)
+		r[fields[t].name] = fields[t].value;
+	return r;
+};
+
+// Static method to encode a hashmap into a name:"value"... string
+String.encodeHashMap = function(hashmap)
+{
+	var r = [];
+	for(var t in hashmap)
+		r.push(t + ':"' + hashmap[t] + '"');
+	return r.join(" ");
+};
+
+// Static method to left-pad a string with 0s to a certain width
+String.zeroPad = function(n,d)
+{
+	var s = n.toString();
+	if(s.length < d)
+		s = "000000000000000000000000000".substr(0,d-s.length) + s;
+	return s;
+};
+
+String.prototype.startsWith = function(prefix) 
+{
+	return !prefix || this.substring(0,prefix.length) == prefix;
+};
+
+// Returns the first value of the given named parameter.
+function getParam(params,name,defaultValue)
+{
+	if(!params)
+		return defaultValue;
+	var p = params[0][name];
+	return p ? p[0] : defaultValue;
+}
+
+// Returns the first value of the given boolean named parameter.
+function getFlag(params,name,defaultValue)
+{
+	return !!getParam(params,name,defaultValue);
+}
+
+// Substitute date components into a string
+Date.prototype.formatString = function(template)
+{
+	var t = template.replace(/0hh12/g,String.zeroPad(this.getHours12(),2));
+	t = t.replace(/hh12/g,this.getHours12());
+	t = t.replace(/0hh/g,String.zeroPad(this.getHours(),2));
+	t = t.replace(/hh/g,this.getHours());
+	t = t.replace(/mmm/g,config.messages.dates.shortMonths[this.getMonth()]);
+	t = t.replace(/0mm/g,String.zeroPad(this.getMinutes(),2));
+	t = t.replace(/mm/g,this.getMinutes());
+	t = t.replace(/0ss/g,String.zeroPad(this.getSeconds(),2));
+	t = t.replace(/ss/g,this.getSeconds());
+	t = t.replace(/[ap]m/g,this.getAmPm().toLowerCase());
+	t = t.replace(/[AP]M/g,this.getAmPm().toUpperCase());
+	t = t.replace(/wYYYY/g,this.getYearForWeekNo());
+	t = t.replace(/wYY/g,String.zeroPad(this.getYearForWeekNo()-2000,2));
+	t = t.replace(/YYYY/g,this.getFullYear());
+	t = t.replace(/YY/g,String.zeroPad(this.getFullYear()-2000,2));
+	t = t.replace(/MMM/g,config.messages.dates.months[this.getMonth()]);
+	t = t.replace(/0MM/g,String.zeroPad(this.getMonth()+1,2));
+	t = t.replace(/MM/g,this.getMonth()+1);
+	t = t.replace(/0WW/g,String.zeroPad(this.getWeek(),2));
+	t = t.replace(/WW/g,this.getWeek());
+	t = t.replace(/DDD/g,config.messages.dates.days[this.getDay()]);
+	t = t.replace(/ddd/g,config.messages.dates.shortDays[this.getDay()]);
+	t = t.replace(/0DD/g,String.zeroPad(this.getDate(),2));
+	t = t.replace(/DDth/g,this.getDate()+this.daySuffix());
+	t = t.replace(/DD/g,this.getDate());
+	return t;
+};
+
+Date.prototype.getWeek = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if (d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week to calculate weekNo
+	var n = Math.floor((dt.getTime()-new Date(dt.getFullYear(),0,1)+3600000)/86400000); 
+	return Math.floor(n/7)+1;
+};
+
+Date.prototype.getYearForWeekNo = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if (d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week
+	return dt.getFullYear();
+};
+
+Date.prototype.getHours12 = function()
+{
+	var h = this.getHours();
+	return h > 12 ? h-12 : ( h > 0 ? h : 12 );
+};
+
+Date.prototype.getAmPm = function()
+{
+	return this.getHours() >= 12 ? config.messages.dates.pm : config.messages.dates.am;
+};
+
+Date.prototype.daySuffix = function()
+{
+	return config.messages.dates.daySuffixes[this.getDate()-1];
+};
+
+// Convert a date to local YYYYMMDDHHMM string format
+Date.prototype.convertToLocalYYYYMMDDHHMM = function()
+{
+	return String.zeroPad(this.getFullYear(),4) + String.zeroPad(this.getMonth()+1,2) + String.zeroPad(this.getDate(),2) + String.zeroPad(this.getHours(),2) + String.zeroPad(this.getMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDDHHMM string format
+Date.prototype.convertToYYYYMMDDHHMM = function()
+{
+	return String.zeroPad(this.getUTCFullYear(),4) + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDD.HHMMSSMMM string format
+Date.prototype.convertToYYYYMMDDHHMMSSMMM = function()
+{
+	return String.zeroPad(this.getUTCFullYear(),4) + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + "." + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2) + String.zeroPad(this.getUTCSeconds(),2) + String.zeroPad(this.getUTCMilliseconds(),4);
+};
+
+// Static method to create a date from a UTC YYYYMMDDHHMM format string
+Date.convertFromYYYYMMDDHHMM = function(d)
+{
+	return new Date(Date.UTC(parseInt(d.substr(0,4),10),
+			parseInt(d.substr(4,2),10)-1,
+			parseInt(d.substr(6,2),10),
+			parseInt(d.substr(8,2),10),
+			parseInt(d.substr(10,2),10),0,0));
+};
+
+//--
+//-- Crypto functions and associated conversion routines
+//--
+
+// Crypto "namespace"
+function Crypto() {}
+
+// Convert a string to an array of big-endian 32-bit words
+Crypto.strToBe32s = function(str)
+{
+	var be = Array();
+	var len = Math.floor(str.length/4);
+	var i, j;
+	for(i=0, j=0; i<len; i++, j+=4) {
+		be[i] = ((str.charCodeAt(j)&0xff) << 24)|((str.charCodeAt(j+1)&0xff) << 16)|((str.charCodeAt(j+2)&0xff) << 8)|(str.charCodeAt(j+3)&0xff);
+	}
+	while (j<str.length) {
+		be[j>>2] |= (str.charCodeAt(j)&0xff)<<(24-(j*8)%32);
+		j++;
+	}
+	return be;
+};
+
+// Convert an array of big-endian 32-bit words to a string
+Crypto.be32sToStr = function(be)
+{
+	var str = "";
+	for(var i=0;i<be.length*32;i+=8)
+		str += String.fromCharCode((be[i>>5]>>>(24-i%32)) & 0xff);
+	return str;
+};
+
+// Convert an array of big-endian 32-bit words to a hex string
+Crypto.be32sToHex = function(be)
+{
+	var hex = "0123456789ABCDEF";
+	var str = "";
+	for(var i=0;i<be.length*4;i++)
+		str += hex.charAt((be[i>>2]>>((3-i%4)*8+4))&0xF) + hex.charAt((be[i>>2]>>((3-i%4)*8))&0xF);
+	return str;
+};
+
+// Return, in hex, the SHA-1 hash of a string
+Crypto.hexSha1Str = function(str)
+{
+	return Crypto.be32sToHex(Crypto.sha1Str(str));
+};
+
+// Return the SHA-1 hash of a string
+Crypto.sha1Str = function(str)
+{
+	return Crypto.sha1(Crypto.strToBe32s(str),str.length);
+};
+
+// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words
+Crypto.sha1 = function(x,blen)
+{
+	// Add 32-bit integers, wrapping at 32 bits
+	add32 = function(a,b)
+	{
+		var lsw = (a&0xFFFF)+(b&0xFFFF);
+		var msw = (a>>16)+(b>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	};
+	// Add five 32-bit integers, wrapping at 32 bits
+	add32x5 = function(a,b,c,d,e)
+	{
+		var lsw = (a&0xFFFF)+(b&0xFFFF)+(c&0xFFFF)+(d&0xFFFF)+(e&0xFFFF);
+		var msw = (a>>16)+(b>>16)+(c>>16)+(d>>16)+(e>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	};
+	// Bitwise rotate left a 32-bit integer by 1 bit
+	rol32 = function(n)
+	{
+		return (n>>>31)|(n<<1);
+	};
+
+	var len = blen*8;
+	// Append padding so length in bits is 448 mod 512
+	x[len>>5] |= 0x80 << (24-len%32);
+	// Append length
+	x[((len+64>>9)<<4)+15] = len;
+	var w = Array(80);
+
+	var k1 = 0x5A827999;
+	var k2 = 0x6ED9EBA1;
+	var k3 = 0x8F1BBCDC;
+	var k4 = 0xCA62C1D6;
+
+	var h0 = 0x67452301;
+	var h1 = 0xEFCDAB89;
+	var h2 = 0x98BADCFE;
+	var h3 = 0x10325476;
+	var h4 = 0xC3D2E1F0;
+
+	for(var i=0;i<x.length;i+=16) {
+		var j,t;
+		var a = h0;
+		var b = h1;
+		var c = h2;
+		var d = h3;
+		var e = h4;
+		for(j = 0;j<16;j++) {
+			w[j] = x[i+j];
+			t = add32x5(e,(a>>>27)|(a<<5),d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=16;j<20;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=20;j<40;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),b^c^d,w[j],k2);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=40;j<60;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),(b&c)|(d&(b|c)),w[j],k3);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=60;j<80;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),b^c^d,w[j],k4);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+
+		h0 = add32(h0,a);
+		h1 = add32(h1,b);
+		h2 = add32(h2,c);
+		h3 = add32(h3,d);
+		h4 = add32(h4,e);
+	}
+	return Array(h0,h1,h2,h3,h4);
+};
+
+//--
+//-- RGB colour object
+//--
+
+// Construct an RGB colour object from a '#rrggbb', '#rgb' or 'rgb(n,n,n)' string or from separate r,g,b values
+function RGB(r,g,b)
+{
+	this.r = 0;
+	this.g = 0;
+	this.b = 0;
+	if(typeof r == "string") {
+		if(r.substr(0,1) == "#") {
+			if(r.length == 7) {
+				this.r = parseInt(r.substr(1,2),16)/255;
+				this.g = parseInt(r.substr(3,2),16)/255;
+				this.b = parseInt(r.substr(5,2),16)/255;
+			} else {
+				this.r = parseInt(r.substr(1,1),16)/15;
+				this.g = parseInt(r.substr(2,1),16)/15;
+				this.b = parseInt(r.substr(3,1),16)/15;
+			}
+		} else {
+			var rgbPattern = /rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)/;
+			var c = r.match(rgbPattern);
+			if(c) {
+				this.r = parseInt(c[1],10)/255;
+				this.g = parseInt(c[2],10)/255;
+				this.b = parseInt(c[3],10)/255;
+			}
+		}
+	} else {
+		this.r = r;
+		this.g = g;
+		this.b = b;
+	}
+	return this;
+}
+
+// Mixes this colour with another in a specified proportion
+// c = other colour to mix
+// f = 0..1 where 0 is this colour and 1 is the new colour
+// Returns an RGB object
+RGB.prototype.mix = function(c,f)
+{
+	return new RGB(this.r + (c.r-this.r) * f,this.g + (c.g-this.g) * f,this.b + (c.b-this.b) * f);
+};
+
+// Return an rgb colour as a #rrggbb format hex string
+RGB.prototype.toString = function()
+{
+	return "#" + ("0" + Math.floor(this.r.clamp(0,1) * 255).toString(16)).right(2) +
+				 ("0" + Math.floor(this.g.clamp(0,1) * 255).toString(16)).right(2) +
+				 ("0" + Math.floor(this.b.clamp(0,1) * 255).toString(16)).right(2);
+};
+
+//--
+//-- DOM utilities - many derived from www.quirksmode.org
+//--
+
+function drawGradient(place,horiz,colours)
+{
+	for(var t=0; t<= 100; t+=2) {
+		var bar = document.createElement("div");
+		place.appendChild(bar);
+		bar.style.position = "absolute";
+		bar.style.left = horiz ? t + "%" : 0;
+		bar.style.top = horiz ? 0 : t + "%";
+		bar.style.width = horiz ? (101-t) + "%" : "100%";
+		bar.style.height = horiz ? "100%" : (101-t) + "%";
+		bar.style.zIndex = -1;
+		var f = t/100;
+		var p = f*(colours.length-1);
+		bar.style.backgroundColor = colours[Math.floor(p)].mix(colours[Math.ceil(p)],p-Math.floor(p)).toString();
+	}
+}
+
+function createTiddlyText(theParent,theText)
+{
+	return theParent.appendChild(document.createTextNode(theText));
+}
+
+function createTiddlyCheckbox(theParent,caption,checked,onChange)
+{
+	var cb = document.createElement("input");
+	cb.setAttribute("type","checkbox");
+	cb.onclick = onChange;
+	theParent.appendChild(cb);
+	cb.checked = checked;
+	cb.className = "chkOptionInput";
+	if(caption)
+		wikify(caption,theParent);
+	return cb;
+}
+
+function createTiddlyElement(theParent,theElement,theID,theClass,theText)
+{
+	var e = document.createElement(theElement);
+	if(theClass != null)
+		e.className = theClass;
+	if(theID != null)
+		e.setAttribute("id",theID);
+	if(theText != null)
+		e.appendChild(document.createTextNode(theText));
+	if(theParent != null)
+		theParent.appendChild(e);
+	return e;
+}
+
+function addEvent(obj,type,fn)
+{
+	if(obj.attachEvent) {
+		obj['e'+type+fn] = fn;
+		obj[type+fn] = function(){obj['e'+type+fn](window.event);};
+		obj.attachEvent('on'+type,obj[type+fn]);
+	} else {
+		obj.addEventListener(type,fn,false);
+	}
+}
+
+function removeEvent(obj,type,fn)
+{
+	if(obj.detachEvent) {
+		obj.detachEvent('on'+type,obj[type+fn]);
+		obj[type+fn] = null;
+	} else {
+		obj.removeEventListener(type,fn,false);
+	}
+}
+
+function addClass(e,theClass)
+{
+	var currClass = e.className.split(" ");
+	if(currClass.indexOf(theClass) == -1)
+		e.className += " " + theClass;
+}
+
+function removeClass(e,theClass)
+{
+	var currClass = e.className.split(" ");
+	var i = currClass.indexOf(theClass);
+	while(i != -1) {
+		currClass.splice(i,1);
+		i = currClass.indexOf(theClass);
+	}
+	e.className = currClass.join(" ");
+}
+
+function hasClass(e,theClass)
+{
+	if(e.className) {
+		if(e.className.split(" ").indexOf(theClass) != -1)
+			return true;
+	}
+	return false;
+}
+
+// Find the closest relative with a given property value (property defaults to tagName, relative defaults to parentNode)
+function findRelated(e,value,name,relative)
+{
+	name = name ? name : "tagName";
+	relative = relative ? relative : "parentNode";
+	if(name == "className") {
+		while(e && !hasClass(e,value)) {
+			e = e[relative];
+		}
+	} else {
+		while(e && e[name] != value) {
+			e = e[relative];
+		}
+	}
+	return e;
+}
+
+// Resolve the target object of an event
+function resolveTarget(e)
+{
+	var obj;
+	if(e.target)
+		obj = e.target;
+	else if(e.srcElement)
+		obj = e.srcElement;
+	if(obj.nodeType == 3) // defeat Safari bug
+		obj = obj.parentNode;
+	return obj;
+}
+
+// Return the content of an element as plain text with no formatting
+function getPlainText(e)
+{
+	var text = "";
+	if(e.innerText)
+		text = e.innerText;
+	else if(e.textContent)
+		text = e.textContent;
+	return text;
+}
+
+// Get the scroll position for window.scrollTo necessary to scroll a given element into view
+function ensureVisible(e)
+{
+	var posTop = findPosY(e);
+	var posBot = posTop + e.offsetHeight;
+	var winTop = findScrollY();
+	var winHeight = findWindowHeight();
+	var winBot = winTop + winHeight;
+	if(posTop < winTop) {
+		return posTop;
+	} else if(posBot > winBot) {
+		if(e.offsetHeight < winHeight)
+			return posTop - (winHeight - e.offsetHeight);
+		else
+			return posTop;
+	} else {
+		return winTop;
+	}
+}
+
+// Get the current width of the display window
+function findWindowWidth()
+{
+	return window.innerWidth ? window.innerWidth : document.documentElement.clientWidth;
+}
+
+// Get the current height of the display window
+function findWindowHeight()
+{
+	return window.innerHeight ? window.innerHeight : document.documentElement.clientHeight;
+}
+
+// Get the current horizontal page scroll position
+function findScrollX()
+{
+	return window.scrollX ? window.scrollX : document.documentElement.scrollLeft;
+}
+
+// Get the current vertical page scroll position
+function findScrollY()
+{
+	return window.scrollY ? window.scrollY : document.documentElement.scrollTop;
+}
+
+function findPosX(obj)
+{
+	var curleft = 0;
+	while(obj.offsetParent) {
+		curleft += obj.offsetLeft;
+		obj = obj.offsetParent;
+	}
+	return curleft;
+}
+
+function findPosY(obj)
+{
+	var curtop = 0;
+	while(obj.offsetParent) {
+		curtop += obj.offsetTop;
+		obj = obj.offsetParent;
+	}
+	return curtop;
+}
+
+// Blur a particular element
+function blurElement(e)
+{
+	if(e != null && e.focus && e.blur) {
+		e.focus();
+		e.blur();
+	}
+}
+
+// Create a non-breaking space
+function insertSpacer(place)
+{
+	var e = document.createTextNode(String.fromCharCode(160));
+	if(place)
+		place.appendChild(e);
+	return e;
+}
+
+// Remove all children of a node
+function removeChildren(e)
+{
+	while(e && e.hasChildNodes())
+		removeNode(e.firstChild);
+}
+
+// Remove a node and all it's children
+function removeNode(e)
+{
+	scrubNode(e);
+	e.parentNode.removeChild(e);
+}
+
+// Remove any event handlers or non-primitve custom attributes
+function scrubNode(e)
+{
+	var att = e.attributes;
+	if(att) {
+		for(var t=0; t<att.length; t++) {
+			var n = att[t].name;
+			if(n !== 'style' && (typeof e[n] === 'function' || (typeof e[n] === 'object' && e[n] != null))) {
+				try {
+					e[n] = null;
+				} catch(ex) {
+				}
+			}
+		}
+	}
+	var c = e.firstChild;
+	while(c) {
+		scrubNode(c);
+		c = c.nextSibling;
+	}
+}
+
+// Add a stylesheet, replacing any previous custom stylesheet
+function setStylesheet(s,id,doc)
+{
+	if(!id)
+		id = "customStyleSheet";
+	if(!doc)
+		doc = document;
+	var n = doc.getElementById(id);
+	if(doc.createStyleSheet) {
+		// Test for IE's non-standard createStyleSheet method
+		if(n)
+			n.parentNode.removeChild(n);
+		// This failed without the &nbsp;
+		doc.getElementsByTagName("head")[0].insertAdjacentHTML("beforeEnd","&nbsp;<style id='" + id + "'>" + s + "</style>");
+	} else {
+		if(n) {
+			n.replaceChild(doc.createTextNode(s),n.firstChild);
+		} else {
+			n = doc.createElement("style");
+			n.type = "text/css";
+			n.id = id;
+			n.appendChild(doc.createTextNode(s));
+			doc.getElementsByTagName("head")[0].appendChild(n);
+		}
+	}
+}
+
+// Force the browser to do a document reflow when needed to workaround browser bugs
+function forceReflow()
+{
+	if(config.browser.isGecko) {
+		setStylesheet("body {top:-1em;margin-top:1em;}");
+		setStylesheet("");
+	}
+}
+
+// Replace the current selection of a textarea or text input and scroll it into view
+function replaceSelection(e,text)
+{
+	if(e.setSelectionRange) {
+		var oldpos = e.selectionStart;
+		var isRange = e.selectionEnd > e.selectionStart;
+		e.value = e.value.substr(0,e.selectionStart) + text + e.value.substr(e.selectionEnd);
+		e.setSelectionRange(isRange ? oldpos : oldpos + text.length,oldpos + text.length);
+		var linecount = e.value.split('\n').length;
+		var thisline = e.value.substr(0,e.selectionStart).split('\n').length-1;
+		e.scrollTop = Math.floor((thisline - e.rows / 2) * e.scrollHeight / linecount);
+	} else if(document.selection) {
+		var range = document.selection.createRange();
+		if(range.parentElement() == e) {
+			var isCollapsed = range.text == "";
+			range.text = text;
+			if(!isCollapsed) {
+				range.moveStart('character', -text.length);
+				range.select();
+			}
+		}
+	}
+}
+
+// Returns the text of the given (text) node, possibly merging subsequent text nodes
+function getNodeText(e)
+{
+	var t = ""; 
+	while(e && e.nodeName == "#text") {
+		t += e.nodeValue;
+		e = e.nextSibling;
+	}
+	return t;
+}
+
+//--
+//-- LoaderBase and SaverBase
+//--
+
+function LoaderBase() {}
+
+LoaderBase.prototype.loadTiddler = function(store,node,tiddlers)
+{
+	var title = this.getTitle(store,node);
+	if(title) {
+		var tiddler = store.createTiddler(title);
+		this.internalizeTiddler(store,tiddler,title,node);
+		tiddlers.push(tiddler);
+	}
+};
+
+LoaderBase.prototype.loadTiddlers = function(store,nodes)
+{
+	var tiddlers = [];
+	for(var t = 0; t < nodes.length; t++) {
+		try {
+			this.loadTiddler(store,nodes[t],tiddlers);
+		} catch(ex) {
+			showException(ex,config.messages.tiddlerLoadError.format([this.getTitle(store,nodes[t])]));
+		}
+	}
+	return tiddlers;
+};
+
+function SaverBase() {}
+
+SaverBase.prototype.externalize = function(store)
+{
+	var results = [];
+	var tiddlers = store.getTiddlers("title");
+	for(var t = 0; t < tiddlers.length; t++)
+		results.push(this.externalizeTiddler(store,tiddlers[t]));
+	return results.join("\n");
+};
+
+//--
+//-- TW21Loader (inherits from LoaderBase)
+//--
+
+function TW21Loader() {}
+
+TW21Loader.prototype = new LoaderBase();
+
+TW21Loader.prototype.getTitle = function(store,node)
+{
+	var title = null;
+	if(node.getAttribute) {
+		title = node.getAttribute("title");
+		if(!title)
+			title = node.getAttribute("tiddler");
+	}
+	if(!title && node.id) {
+		var lenPrefix = store.idPrefix.length;
+		if (node.id.substr(0,lenPrefix) == store.idPrefix)
+			title = node.id.substr(lenPrefix);
+	}
+	return title;
+};
+
+TW21Loader.prototype.internalizeTiddler = function(store,tiddler,title,node)
+{
+	var e = node.firstChild;
+	var text = null;
+	if(node.getAttribute("tiddler")) {
+		text = getNodeText(e).unescapeLineBreaks();
+	} else {
+		while(e.nodeName!="PRE" && e.nodeName!="pre") {
+			e = e.nextSibling;
+		}
+		text = e.innerHTML.replace(/\r/mg,"").htmlDecode();
+	}
+	var modifier = node.getAttribute("modifier");
+	var c = node.getAttribute("created");
+	var m = node.getAttribute("modified");
+	var created = c ? Date.convertFromYYYYMMDDHHMM(c) : version.date;
+	var modified = m ? Date.convertFromYYYYMMDDHHMM(m) : created;
+	var tags = node.getAttribute("tags");
+	var fields = {};
+	var attrs = node.attributes;
+	for(var i = attrs.length-1; i >= 0; i--) {
+		var name = attrs[i].name;
+		if (attrs[i].specified && !TiddlyWiki.isStandardField(name)) {
+			fields[name] = attrs[i].value.unescapeLineBreaks();
+		}
+	}
+	tiddler.assign(title,text,modifier,modified,tags,created,fields);
+	return tiddler;
+};
+
+//--
+//-- TW21Saver (inherits from SaverBase)
+//--
+
+function TW21Saver() {}
+
+TW21Saver.prototype = new SaverBase();
+
+TW21Saver.prototype.externalizeTiddler = function(store,tiddler)
+{
+	try {
+		var extendedAttributes = "";
+		var usePre = config.options.chkUsePreForStorage;
+		store.forEachField(tiddler,
+			function(tiddler,fieldName,value) {
+				// don't store stuff from the temp namespace
+				if(typeof value != "string")
+					value = "";
+				if (!fieldName.match(/^temp\./))
+					extendedAttributes += ' %0="%1"'.format([fieldName,value.escapeLineBreaks().htmlEncode()]);
+			},true);
+		var created = tiddler.created.convertToYYYYMMDDHHMM();
+		var modified = tiddler.modified.convertToYYYYMMDDHHMM();
+		var vdate = version.date.convertToYYYYMMDDHHMM();
+		var attributes = tiddler.modifier ? ' modifier="' + tiddler.modifier.htmlEncode() + '"' : "";
+		attributes += (usePre && modified == created) ? "" : ' modified="' + modified +'"';
+		attributes += (usePre && created == vdate) ? "" :' created="' + created + '"';
+		var tags = tiddler.getTags();
+		if(!usePre || tags)
+			attributes += ' tags="' + tags.htmlEncode() + '"';
+		return ('<div %0="%1"%2%3>%4</'+'div>').format([
+				usePre ? "title" : "tiddler",
+				tiddler.title.htmlEncode(),
+				attributes,
+				extendedAttributes,
+				usePre ? "\n<pre>" + tiddler.text.htmlEncode() + "</pre>\n" : tiddler.text.escapeLineBreaks().htmlEncode()
+			]);
+	} catch (ex) {
+		throw exceptionText(ex,config.messages.tiddlerSaveError.format([tiddler.title]));
+	}
+};
+
+//--
+//-- Deprecated code
+//--
+
+// @Deprecated: Use createElementAndWikify and this.termRegExp instead
+config.formatterHelpers.charFormatHelper = function(w)
+{
+	w.subWikify(createTiddlyElement(w.output,this.element),this.terminator);
+};
+
+// @Deprecated: Use enclosedTextHelper and this.lookaheadRegExp instead
+config.formatterHelpers.monospacedByLineHelper = function(w)
+{
+	var lookaheadRegExp = new RegExp(this.lookahead,"mg");
+	lookaheadRegExp.lastIndex = w.matchStart;
+	var lookaheadMatch = lookaheadRegExp.exec(w.source);
+	if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+		var text = lookaheadMatch[1];
+		if(config.browser.isIE)
+			text = text.replace(/\n/g,"\r");
+		createTiddlyElement(w.output,"pre",null,null,text);
+		w.nextMatch = lookaheadRegExp.lastIndex;
+	}
+};
+
+// @Deprecated: Use <br> or <br /> instead of <<br>>
+config.macros.br.handler = function(place)
+{
+	createTiddlyElement(place,"br");
+};
+
+// Find an entry in an array. Returns the array index or null
+// @Deprecated: Use indexOf instead
+Array.prototype.find = function(item)
+{
+	var i = this.indexOf(item);
+	return i == -1 ? null : i;
+};
+
+// Load a tiddler from an HTML DIV. The caller should make sure to later call Tiddler.changed()
+// @Deprecated: Use store.getLoader().internalizeTiddler instead
+Tiddler.prototype.loadFromDiv = function(divRef,title)
+{
+	return store.getLoader().internalizeTiddler(store,this,title,divRef);
+};
+
+// Format the text for storage in an HTML DIV
+// @Deprecated Use store.getSaver().externalizeTiddler instead.
+Tiddler.prototype.saveToDiv = function()
+{
+	return store.getSaver().externalizeTiddler(store,this);
+};
+
+// @Deprecated: Use store.allTiddlersAsHtml() instead
+function allTiddlersAsHtml()
+{
+	return store.allTiddlersAsHtml();
+}
+
+// @Deprecated: Use refreshPageTemplate instead
+function applyPageTemplate(title)
+{
+	refreshPageTemplate(title);
+}
+
+// @Deprecated: Use story.displayTiddlers instead
+function displayTiddlers(srcElement,titles,template,unused1,unused2,animate,unused3)
+{
+	story.displayTiddlers(srcElement,titles,template,animate);
+}
+
+// @Deprecated: Use story.displayTiddler instead
+function displayTiddler(srcElement,title,template,unused1,unused2,animate,unused3)
+{
+	story.displayTiddler(srcElement,title,template,animate);
+}
+
+// @Deprecated: Use functions on right hand side directly instead
+var createTiddlerPopup = Popup.create;
+var scrollToTiddlerPopup = Popup.show;
+var hideTiddlerPopup = Popup.remove;
+
+// @Deprecated: Use right hand side directly instead
+var regexpBackSlashEn = new RegExp("\\\\n","mg");
+var regexpBackSlash = new RegExp("\\\\","mg");
+var regexpBackSlashEss = new RegExp("\\\\s","mg");
+var regexpNewLine = new RegExp("\n","mg");
+var regexpCarriageReturn = new RegExp("\r","mg");
+//--
+//-- End of scripts
+//--
+//]]>
+</script>
+<script type="text/javascript">
+//<![CDATA[
+if(useJavaSaver)
+	document.write("<applet style='position:absolute;left:-1px' name='TiddlySaver' code='TiddlySaver.class' archive='TiddlySaver.jar' width='1' height='1'></applet>");
+//]]>
+</script>
+<!--POST-SCRIPT-START-->
+
+<!--POST-SCRIPT-END-->
+</body>
+</html>
diff --git a/wiki/index.html b/wiki/index.html
index f2f7f8139..7a4d039ca 100755
--- a/wiki/index.html
+++ b/wiki/index.html
@@ -776,72 +776,6 @@ for __Running__</pre>
 * provide central interface for setting switches and configuration options
 * installing of some or all created artifacts</pre>
 </div>
-<div title="LumieraDesignProcess" modifier="MichaelPloujnikov" modified="200706270317" created="200706181202" tags="process" changecount="5">
-<pre>! Lumiera design process
-A lightweight formalized process how people can add proposals for the Lumiera development.
-
-
-!! Description
-Use the Wiki at http://www.pipapo.org/pipawiki/Lumiera/DesignProcess to make it easy to add proposals in a well defined manner.
-
-I'd like to introduce a slightly formalized process for the ongoing Lumiera planning:
-* Every proposal is instantiated as 'Idea', the author gives other people the opportunity to review and comment on it with extreme prejudice, while still working out details.
-* When the the 'Idea' in a proper form and worked out in most details it becomes a 'Draft'. This 'Draft' need to be carefully reviewed, commented, perhaps corrected and rated by the other Developers.
-* At some point we may decide that a 'Draft' becomes a 'Final' (I leave it open how this decision shall be done for now). 'Final' Documents will be imported into the repository (this wiki, you are reading such a Document right now!).
-
-* Sometimes proposals will become dropped for some reason, this is indicated by changing their state to 'Dropped', they still stay in the system for further reference.
-
-!!! Pros
-* simple
-* flexible
-* no much rules
-* persistent and at Final stage well documented process
-
-!!! Cons
-* could be abused/vandalized (but wiki can use ACL's)
-* depends on my server, this might be unfavorable or unreliable, ymmv.
-* will only work if all or almost all involved people agree on this process
-
-!!! Alternatives
-We could use some forum, Trac, Mailinglist or whatever instead.
-
-Just for Design documentation I would give [[Bouml|http://bouml.free.fr/]] a try. For myself, I am not very fond of UML Design tools, while Bouml looks quite promising and we could maintain the UML model in git repositories which would be more favorable than this centralized wiki. The backside is that this needs even more agreement between the developers, everyone has to install and use Bouml (and learn its usage) and design is constrained by a external tool.
-
-This distributed wiki might be used instead the pipapo.org wiki, investigate that for future.
-
-!! Rationale
-Wiki works. It is simple to use and just flexible enough to handle the task. I don't go to install any other software for such tasks on my server. While the design progresses I'd propose to move our work into git repositories and eventually phase this wiki pages out anyways. I'd rather like to start out distributed/git right away .. but git gives us only a fine storage layer, for a design process we need some good presentation layer (later when using git and starting the implementation everyones favorite editor serves for that) I have no better ideas yet to solve the presentation problem other than using this wiki (or maybe Bouml).
-</pre>
-</div>
-<div title="LumieraWiki" modifier="Ichthyostega" modified="200708170218" created="200706172308" tags="portal" changecount="29">
-<pre>This is the entry point to several [[TiddlyWiki]]-Pages containing the developer and design documentation for Lumiera.
-
-* Cehteh started GitNotes where we will collect some information about git, howto and special setups
-* since we prefer gpg signed tags in git and not each developer knows gpg well here is a Micro-GPG-HowTo 
-* we maintain (semi-) final design docs in DesignDocumentation
-* Things get often worked out on IRC, see IRC-Transcripts for decisions made there and not yet put into the proper documentation places
-
-Please __end your tiddlers in a newline__, this makes merging in git easier since the /pre tag used in tiddlywiki will become on a single line.
-
-----
-!Design Draft
-to get started, we create design drafts emphasizing different aspects and regions of Lumiera
-
-* Ichthyo focuses mainly on the Render Engine and its interconnection to the EDL, [[see this separate page|renderengine.html]]
-* Cehteh works on the data backend draft, see [[this page|backend.html]]
-* Some tools which don't fit somewhere else and are used everywhere are put into a [[Support Library|support_library.html]]
-* [[Description of the Test System|TestSh]]
-
-!Coding Structures
-next we should //start thinking// on how to organize several aspects of the practical coding...
-* what to do in BOUML?                          &amp;rarr; [[more|whatInBOUML]]
-* how to organize packages, files, includes?    &amp;rarr; [[more|SrcTreeStructure]]
-* how to organize the executable to be built?
-* what coding conventions to prefer?            &amp;rarr; [[GNU Style|DesignDocumentation]]
-* what [[build system|BuildSystem]] to use?
-* various [[build dependencies|BuildDependenceis]]
-* TestSuite</pre>
-</div>
 <div title="DefaultTiddlers" modifier="CehTeh" modified="200707111115" created="200706172308" changecount="3">
 <pre>LumieraWiki
 ShortCuts</pre>
@@ -1407,9 +1341,77 @@ config.formatters.push( {
 } )
 //}}}</pre>
 </div>
-<div title="MainMenu" modifier="CehTeh" modified="200707111114" created="200706172305" changecount="4">
+<div title="LumieraDesignProcess" modifier="MichaelPloujnikov" modified="200706270317" created="200706181202" tags="process" changecount="5">
+<pre>! Lumiera design process
+A lightweight formalized process how people can add proposals for the Lumiera development.
+
+
+!! Description
+Use the Wiki at http://www.pipapo.org/pipawiki/Lumiera/DesignProcess to make it easy to add proposals in a well defined manner.
+
+I'd like to introduce a slightly formalized process for the ongoing Lumiera planning:
+* Every proposal is instantiated as 'Idea', the author gives other people the opportunity to review and comment on it with extreme prejudice, while still working out details.
+* When the the 'Idea' in a proper form and worked out in most details it becomes a 'Draft'. This 'Draft' need to be carefully reviewed, commented, perhaps corrected and rated by the other Developers.
+* At some point we may decide that a 'Draft' becomes a 'Final' (I leave it open how this decision shall be done for now). 'Final' Documents will be imported into the repository (this wiki, you are reading such a Document right now!).
+
+* Sometimes proposals will become dropped for some reason, this is indicated by changing their state to 'Dropped', they still stay in the system for further reference.
+
+!!! Pros
+* simple
+* flexible
+* no much rules
+* persistent and at Final stage well documented process
+
+!!! Cons
+* could be abused/vandalized (but wiki can use ACL's)
+* depends on my server, this might be unfavorable or unreliable, ymmv.
+* will only work if all or almost all involved people agree on this process
+
+!!! Alternatives
+We could use some forum, Trac, Mailinglist or whatever instead.
+
+Just for Design documentation I would give [[Bouml|http://bouml.free.fr/]] a try. For myself, I am not very fond of UML Design tools, while Bouml looks quite promising and we could maintain the UML model in git repositories which would be more favorable than this centralized wiki. The backside is that this needs even more agreement between the developers, everyone has to install and use Bouml (and learn its usage) and design is constrained by a external tool.
+
+This distributed wiki might be used instead the pipapo.org wiki, investigate that for future.
+
+!! Rationale
+Wiki works. It is simple to use and just flexible enough to handle the task. I don't go to install any other software for such tasks on my server. While the design progresses I'd propose to move our work into git repositories and eventually phase this wiki pages out anyways. I'd rather like to start out distributed/git right away .. but git gives us only a fine storage layer, for a design process we need some good presentation layer (later when using git and starting the implementation everyones favorite editor serves for that) I have no better ideas yet to solve the presentation problem other than using this wiki (or maybe Bouml).
+</pre>
+</div>
+<div title="LumieraWiki" modifier="Ichthyostega" modified="200708170218" created="200706172308" tags="portal" changecount="29">
+<pre>This is the entry point to several [[TiddlyWiki]]-Pages containing the developer and design documentation for Lumiera.
+
+* Cehteh started GitNotes where we will collect some information about git, howto and special setups
+* since we prefer gpg signed tags in git and not each developer knows gpg well here is a Micro-GPG-HowTo 
+* we maintain (semi-) final design docs in DesignDocumentation
+* Things get often worked out on IRC, see IRC-Transcripts for decisions made there and not yet put into the proper documentation places
+
+Please __end your tiddlers in a newline__, this makes merging in git easier since the /pre tag used in tiddlywiki will become on a single line.
+
+----
+!Design Draft
+to get started, we create design drafts emphasizing different aspects and regions of Lumiera
+
+* Ichthyo focuses mainly on the Render Engine and its interconnection to the EDL, [[see this separate page|renderengine.html]]
+* Cehteh works on the data backend draft, see [[this page|backend.html]]
+* Some tools which don't fit somewhere else and are used everywhere are put into a [[Support Library|support_library.html]]
+* [[Description of the Test System|TestSh]]
+
+!Coding Structures
+next we should //start thinking// on how to organize several aspects of the practical coding...
+* what to do in BOUML?                          &amp;rarr; [[more|whatInBOUML]]
+* how to organize packages, files, includes?    &amp;rarr; [[more|SrcTreeStructure]]
+* how to organize the executable to be built?
+* what coding conventions to prefer?            &amp;rarr; [[GNU Style|DesignDocumentation]]
+* what [[build system|BuildSystem]] to use?
+* various [[build dependencies|BuildDependenceis]]
+* TestSuite</pre>
+</div>
+<div title="MainMenu" modifier="CehTeh" modified="200803281345" created="200706172305" changecount="6">
 <pre>GettingStarted
 [[LumieraWiki]]
+[[Compatibility|compatibility.html]]
+[[ToDo|todo.html]]
 [[Backend|backend.html]]
 [[Proc-Layer|renderengine.html]]
 [[Support-Library|support_library.html]]
@@ -1432,7 +1434,7 @@ Some of these things work quite well, there is an overall friendly relation betw
 
 But there are some bad things too. Notably there is not much progress on the community development. Users don't benefit from new improvements which other people have made. There is a endlessly growing list of bugs and feature requests, when someone sends a patch to the ML he has to invest quite some time to maintain it until it might be merged. Finally we don't know what heroine virtual is working on, until we see his next tarball.
 
-!! Solution for "Cinelerra3" / Lumiera
+!! Solution for &quot;Cinelerra3&quot; / Lumiera
 Cinelerra is heroine's product, this time we should work together with him to make it pleasant and progressing for anyone.
 We are in need of a new development model which is acceptable by all involved people and benefits from the way Cinelerra development worked the years before, without maintaining the bad sides again: 
 
diff --git a/wiki/support_library.html b/wiki/support_library.html
index 095ca833f..8a6bc456b 100644
--- a/wiki/support_library.html
+++ b/wiki/support_library.html
@@ -643,6 +643,11 @@ TertiaryMid: #999
 TertiaryDark: #666
 Error: #f88</pre>
 </div>
+<div title="Cuckoo" modifier="CehTeh" modified="200803281418" created="200803281417" changecount="2">
+<pre>This hashing gives guaranteed O(1) lookup complexity and amortized O(1) insert and remove complexity. Hash tables by default grow and shrink automatically. It is posible to preallocate entries and turn automatic shrinking off taking out the memory management factors for insert and remove operations. This implementation uses 3 Tables which exponential growing sizes.
+
+Hash table utilization is commonly between 40-80% which gives better memory usage and far better locality than trees.</pre>
+</div>
 <div title="DefaultTiddlers" modifier="CehTeh" modified="200707102306" created="200707102301" changecount="2">
 <pre>[[SupportLibrary]]</pre>
 </div>
@@ -2188,6 +2193,31 @@ config.macros.rssFeedUpdate = {
 //}}}
 </pre>
 </div>
+<div title="SafeCLib" modifier="CehTeh" modified="200803281413" created="200803281406" changecount="4">
+<pre>! Memory allocation
+* lumiera_malloc()
+  Succceeds or dies, no need for error handling.
+
+! String functions
+Small wrapers and extensions to the string.h functions, handle NULL pointers gracefully.
+* lumiera_strndup()
+  Succceeds or dies, no need for error handling.
+* lumiera_strncmp() lumiera_streq()
+  Optimized comparing same addresses.
+
+! Round robin temporary buffers
+Provides 64 buffers per thread which are recycled with each use, the idea here is to have fast buffers for temporal data without need for explicit heap management or stack waste.
+
+* lumiera_tmpbuf_provide ()
+ Acquire a temporary buffer. doesn't need to be freed. Stays valid for the next 63 tmpbuf calls.
+
+* lumiera_tmpbuf_strndup ()
+ Duplicate string to a tmpbuf.
+
+* lumiera_tmpbuf_sprintf ()
+ Construct a string in a tmpbuf.
+</pre>
+</div>
 <div title="SelectingInterfaces" modifier="CehTeh" created="200708120132" changecount="2">
 <pre>Each Plugin can export different Interfaces, even same interfaces with different capabilities like a effect for different color models or such.
 
@@ -2419,7 +2449,7 @@ h1,h2,h3,h4,h5,h6 {
 /*}}}*/
 </pre>
 </div>
-<div title="SupportLibrary" modifier="CehTeh" modified="200709021227" created="200707102314" changecount="9">
+<div title="SupportLibrary" modifier="CehTeh" modified="200803281414" created="200707102314" changecount="11">
 <pre>The Support Library contains all tools we need at various places, but by themselves don't defines a subsystem on their own.
 
 These things are:
@@ -2428,8 +2458,9 @@ These things are:
 * a wrapper for POSIX Threads
 ** Thread creation joining and canceling
 ** [[Locking primitives like Condition variables and Mutexes|LockingPrimitives]]
-* [[Frame and Time handling and calculations|FrameAndTime]]
- 
+* [[Some tools and wrapers around the C library|SafeCLib]]
+* [[O(1) hashtable using Cuckoo hashing|Cuckoo]]
+
 (... to be continued)
 </pre>
 </div>
diff --git a/wiki/todo.html b/wiki/todo.html
new file mode 100644
index 000000000..7440ab36a
--- /dev/null
+++ b/wiki/todo.html
@@ -0,0 +1,11631 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<script type="text/javascript">
+//<![CDATA[
+var version = {title: "TiddlyWiki", major: 2, minor: 2, revision: 3, date: new Date("Jun 17, 2007"), extensions: {}};
+//]]>
+</script>
+<!--
+TiddlyWiki created by Jeremy Ruston, (jeremy [at] osmosoft [dot] com)
+
+Copyright (c) UnaMesa Association 2004-2007
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+Neither the name of the UnaMesa Association nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+-->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<!--PRE-HEAD-START-->
+<!--{{{-->
+<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>
+<!--}}}-->
+
+<style type="text/css">#contentWrapper {display:none;}</style><div id="SplashScreen" style="border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;"><b>My TiddlyWiki</b> is loading<blink> ...</blink><br><br><span style="font-size: 14px; color:red;">Requires Javascript.</span></div>
+<!--PRE-HEAD-END-->
+<title> ToDo - Roadmap and tasks </title>
+<style type="text/css">
+#saveTest {display:none;}
+#messageArea {display:none;}
+#copyright {display:none;}
+#storeArea {display:none;}
+#storeArea div {padding:0.5em; margin:1em 0em 0em 0em; border-color:#fff #666 #444 #ddd; border-style:solid; border-width:2px; overflow:auto;}
+#shadowArea {display:none;}
+#javascriptWarning {width:100%; text-align:center; font-weight:bold; background-color:#dd1100; color:#fff; padding:1em 0em;}
+</style>
+<!--POST-HEAD-START-->
+
+<!--POST-HEAD-END-->
+</head>
+<body onload="main();" onunload="if(window.checkUnsavedChanges) checkUnsavedChanges(); if(window.scrubNodes) scrubNodes(document.body);">
+<!--PRE-BODY-START-->
+
+<!--PRE-BODY-END-->
+<div id="copyright">
+Welcome to TiddlyWiki created by Jeremy Ruston, Copyright &copy; 2007 UnaMesa Association
+</div>
+<noscript>
+	<div id="javascriptWarning">This page requires JavaScript to function properly.<br /><br />If you are using Microsoft Internet Explorer you may need to click on the yellow bar above and select 'Allow Blocked Content'. You must then click 'Yes' on the following security warning.</div>
+</noscript>
+<div id="saveTest"></div>
+<div id="backstageCloak"></div>
+<div id="backstageButton"></div>
+<div id="backstageArea"><div id="backstageToolbar"></div></div>
+<div id="backstage">
+	<div id="backstagePanel"></div>
+</div>
+<div id="contentWrapper"></div>
+<div id="contentStash"></div>
+<div id="shadowArea">
+<div title="ColorPalette">
+<pre>Background: #fff
+Foreground: #000
+PrimaryPale: #8cf
+PrimaryLight: #18f
+PrimaryMid: #04b
+PrimaryDark: #014
+SecondaryPale: #ffc
+SecondaryLight: #fe8
+SecondaryMid: #db4
+SecondaryDark: #841
+TertiaryPale: #eee
+TertiaryLight: #ccc
+TertiaryMid: #999
+TertiaryDark: #666
+Error: #f88</pre>
+</div>
+<div title="StyleSheetColors">
+<pre>/*{{{*/
+body {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+
+a {color:[[ColorPalette::PrimaryMid]];}
+a:hover {background-color:[[ColorPalette::PrimaryMid]]; color:[[ColorPalette::Background]];}
+a img {border:0;}
+
+h1,h2,h3,h4,h5,h6 {color:[[ColorPalette::SecondaryDark]]; background:transparent;}
+h1 {border-bottom:2px solid [[ColorPalette::TertiaryLight]];}
+h2,h3 {border-bottom:1px solid [[ColorPalette::TertiaryLight]];}
+
+.button {color:[[ColorPalette::PrimaryDark]]; border:1px solid [[ColorPalette::Background]];}
+.button:hover {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::SecondaryLight]]; border-color:[[ColorPalette::SecondaryMid]];}
+.button:active {color:[[ColorPalette::Background]]; background:[[ColorPalette::SecondaryMid]]; border:1px solid [[ColorPalette::SecondaryDark]];}
+
+.header {background:[[ColorPalette::PrimaryMid]];}
+.headerShadow {color:[[ColorPalette::Foreground]];}
+.headerShadow a {font-weight:normal; color:[[ColorPalette::Foreground]];}
+.headerForeground {color:[[ColorPalette::Background]];}
+.headerForeground a {font-weight:normal; color:[[ColorPalette::PrimaryPale]];}
+
+.tabSelected{color:[[ColorPalette::PrimaryDark]];
+	background:[[ColorPalette::TertiaryPale]];
+	border-left:1px solid [[ColorPalette::TertiaryLight]];
+	border-top:1px solid [[ColorPalette::TertiaryLight]];
+	border-right:1px solid [[ColorPalette::TertiaryLight]];
+}
+.tabUnselected {color:[[ColorPalette::Background]]; background:[[ColorPalette::TertiaryMid]];}
+.tabContents {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::TertiaryPale]]; border:1px solid [[ColorPalette::TertiaryLight]];}
+.tabContents .button {border:0;}
+
+#sidebar {}
+#sidebarOptions input {border:1px solid [[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel {background:[[ColorPalette::PrimaryPale]];}
+#sidebarOptions .sliderPanel a {border:none;color:[[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel a:hover {color:[[ColorPalette::Background]]; background:[[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel a:active {color:[[ColorPalette::PrimaryMid]]; background:[[ColorPalette::Background]];}
+
+.wizard {background:[[ColorPalette::PrimaryPale]]; border:1px solid [[ColorPalette::PrimaryMid]];}
+.wizard h1 {color:[[ColorPalette::PrimaryDark]]; border:none;}
+.wizard h2 {color:[[ColorPalette::Foreground]]; border:none;}
+.wizardStep {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];
+	border:1px solid [[ColorPalette::PrimaryMid]];}
+.wizardStep.wizardStepDone {background::[[ColorPalette::TertiaryLight]];}
+.wizardFooter {background:[[ColorPalette::PrimaryPale]];}
+.wizardFooter .status {background:[[ColorPalette::PrimaryDark]]; color:[[ColorPalette::Background]];}
+.wizard .button {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::SecondaryLight]]; border: 1px solid;
+	border-color:[[ColorPalette::SecondaryPale]] [[ColorPalette::SecondaryDark]] [[ColorPalette::SecondaryDark]] [[ColorPalette::SecondaryPale]];}
+.wizard .button:hover {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::Background]];}
+.wizard .button:active {color:[[ColorPalette::Background]]; background:[[ColorPalette::Foreground]]; border: 1px solid;
+	border-color:[[ColorPalette::PrimaryDark]] [[ColorPalette::PrimaryPale]] [[ColorPalette::PrimaryPale]] [[ColorPalette::PrimaryDark]];}
+
+#messageArea {border:1px solid [[ColorPalette::SecondaryMid]]; background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]];}
+#messageArea .button {color:[[ColorPalette::PrimaryMid]]; background:[[ColorPalette::SecondaryPale]]; border:none;}
+
+.popupTiddler {background:[[ColorPalette::TertiaryPale]]; border:2px solid [[ColorPalette::TertiaryMid]];}
+
+.popup {background:[[ColorPalette::TertiaryPale]]; color:[[ColorPalette::TertiaryDark]]; border-left:1px solid [[ColorPalette::TertiaryMid]]; border-top:1px solid [[ColorPalette::TertiaryMid]]; border-right:2px solid [[ColorPalette::TertiaryDark]]; border-bottom:2px solid [[ColorPalette::TertiaryDark]];}
+.popup hr {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::PrimaryDark]]; border-bottom:1px;}
+.popup li.disabled {color:[[ColorPalette::TertiaryMid]];}
+.popup li a, .popup li a:visited {color:[[ColorPalette::Foreground]]; border: none;}
+.popup li a:hover {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; border: none;}
+.popup li a:active {background:[[ColorPalette::SecondaryPale]]; color:[[ColorPalette::Foreground]]; border: none;}
+.popupHighlight {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+.listBreak div {border-bottom:1px solid [[ColorPalette::TertiaryDark]];}
+
+.tiddler .defaultCommand {font-weight:bold;}
+
+.shadow .title {color:[[ColorPalette::TertiaryDark]];}
+
+.title {color:[[ColorPalette::SecondaryDark]];}
+.subtitle {color:[[ColorPalette::TertiaryDark]];}
+
+.toolbar {color:[[ColorPalette::PrimaryMid]];}
+.toolbar a {color:[[ColorPalette::TertiaryLight]];}
+.selected .toolbar a {color:[[ColorPalette::TertiaryMid]];}
+.selected .toolbar a:hover {color:[[ColorPalette::Foreground]];}
+
+.tagging, .tagged {border:1px solid [[ColorPalette::TertiaryPale]]; background-color:[[ColorPalette::TertiaryPale]];}
+.selected .tagging, .selected .tagged {background-color:[[ColorPalette::TertiaryLight]]; border:1px solid [[ColorPalette::TertiaryMid]];}
+.tagging .listTitle, .tagged .listTitle {color:[[ColorPalette::PrimaryDark]];}
+.tagging .button, .tagged .button {border:none;}
+
+.footer {color:[[ColorPalette::TertiaryLight]];}
+.selected .footer {color:[[ColorPalette::TertiaryMid]];}
+
+.sparkline {background:[[ColorPalette::PrimaryPale]]; border:0;}
+.sparktick {background:[[ColorPalette::PrimaryDark]];}
+
+.error, .errorButton {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::Error]];}
+.warning {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::SecondaryPale]];}
+.lowlight {background:[[ColorPalette::TertiaryLight]];}
+
+.zoomer {background:none; color:[[ColorPalette::TertiaryMid]]; border:3px solid [[ColorPalette::TertiaryMid]];}
+
+.imageLink, #displayArea .imageLink {background:transparent;}
+
+.annotation {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; border:2px solid [[ColorPalette::SecondaryMid]];}
+
+.viewer .listTitle {list-style-type:none; margin-left:-2em;}
+.viewer .button {border:1px solid [[ColorPalette::SecondaryMid]];}
+.viewer blockquote {border-left:3px solid [[ColorPalette::TertiaryDark]];}
+
+.viewer table, table.twtable {border:2px solid [[ColorPalette::TertiaryDark]];}
+.viewer th, .viewer thead td, .twtable th, .twtable thead td {background:[[ColorPalette::SecondaryMid]]; border:1px solid [[ColorPalette::TertiaryDark]]; color:[[ColorPalette::Background]];}
+.viewer td, .viewer tr, .twtable td, .twtable tr {border:1px solid [[ColorPalette::TertiaryDark]];}
+
+.viewer pre {border:1px solid [[ColorPalette::SecondaryLight]]; background:[[ColorPalette::SecondaryPale]];}
+.viewer code {color:[[ColorPalette::SecondaryDark]];}
+.viewer hr {border:0; border-top:dashed 1px [[ColorPalette::TertiaryDark]]; color:[[ColorPalette::TertiaryDark]];}
+
+.highlight, .marked {background:[[ColorPalette::SecondaryLight]];}
+
+.editor input {border:1px solid [[ColorPalette::PrimaryMid]];}
+.editor textarea {border:1px solid [[ColorPalette::PrimaryMid]]; width:100%;}
+.editorFooter {color:[[ColorPalette::TertiaryMid]];}
+
+#backstageArea {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::TertiaryMid]];}
+#backstageArea a {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::Background]]; border:none;}
+#backstageArea a:hover {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; }
+#backstageArea a.backstageSelTab {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+#backstageButton a {background:none; color:[[ColorPalette::Background]]; border:none;}
+#backstageButton a:hover {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::Background]]; border:none;}
+#backstagePanel {background:[[ColorPalette::Background]]; border-color: [[ColorPalette::Background]] [[ColorPalette::TertiaryDark]] [[ColorPalette::TertiaryDark]] [[ColorPalette::TertiaryDark]];}
+.backstagePanelFooter .button {border:none; color:[[ColorPalette::Background]];}
+.backstagePanelFooter .button:hover {color:[[ColorPalette::Foreground]];}
+#backstageCloak {background:[[ColorPalette::Foreground]]; opacity:0.6; filter:'alpha(opacity:60)';}
+/*}}}*/</pre>
+</div>
+<div title="StyleSheetLayout">
+<pre>/*{{{*/
+* html .tiddler {height:1%;}
+
+body {font-size:.75em; font-family:arial,helvetica; margin:0; padding:0;}
+
+h1,h2,h3,h4,h5,h6 {font-weight:bold; text-decoration:none;}
+h1,h2,h3 {padding-bottom:1px; margin-top:1.2em;margin-bottom:0.3em;}
+h4,h5,h6 {margin-top:1em;}
+h1 {font-size:1.35em;}
+h2 {font-size:1.25em;}
+h3 {font-size:1.1em;}
+h4 {font-size:1em;}
+h5 {font-size:.9em;}
+
+hr {height:1px;}
+
+a {text-decoration:none;}
+
+dt {font-weight:bold;}
+
+ol {list-style-type:decimal;}
+ol ol {list-style-type:lower-alpha;}
+ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol {list-style-type:decimal;}
+ol ol ol ol ol {list-style-type:lower-alpha;}
+ol ol ol ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol ol ol ol {list-style-type:decimal;}
+
+.txtOptionInput {width:11em;}
+
+#contentWrapper .chkOptionInput {border:0;}
+
+.externalLink {text-decoration:underline;}
+
+.indent {margin-left:3em;}
+.outdent {margin-left:3em; text-indent:-3em;}
+code.escaped {white-space:nowrap;}
+
+.tiddlyLinkExisting {font-weight:bold;}
+.tiddlyLinkNonExisting {font-style:italic;}
+
+/* the 'a' is required for IE, otherwise it renders the whole tiddler in bold */
+a.tiddlyLinkNonExisting.shadow {font-weight:bold;}
+
+#mainMenu .tiddlyLinkExisting,
+	#mainMenu .tiddlyLinkNonExisting,
+	#sidebarTabs .tiddlyLinkNonExisting {font-weight:normal; font-style:normal;}
+#sidebarTabs .tiddlyLinkExisting {font-weight:bold; font-style:normal;}
+
+.header {position:relative;}
+.header a:hover {background:transparent;}
+.headerShadow {position:relative; padding:4.5em 0em 1em 1em; left:-1px; top:-1px;}
+.headerForeground {position:absolute; padding:4.5em 0em 1em 1em; left:0px; top:0px;}
+
+.siteTitle {font-size:3em;}
+.siteSubtitle {font-size:1.2em;}
+
+#mainMenu {position:absolute; left:0; width:10em; text-align:right; line-height:1.6em; padding:1.5em 0.5em 0.5em 0.5em; font-size:1.1em;}
+
+#sidebar {position:absolute; right:3px; width:16em; font-size:.9em;}
+#sidebarOptions {padding-top:0.3em;}
+#sidebarOptions a {margin:0em 0.2em; padding:0.2em 0.3em; display:block;}
+#sidebarOptions input {margin:0.4em 0.5em;}
+#sidebarOptions .sliderPanel {margin-left:1em; padding:0.5em; font-size:.85em;}
+#sidebarOptions .sliderPanel a {font-weight:bold; display:inline; padding:0;}
+#sidebarOptions .sliderPanel input {margin:0 0 .3em 0;}
+#sidebarTabs .tabContents {width:15em; overflow:hidden;}
+
+.wizard {padding:0.1em 1em 0em 2em;}
+.wizard h1 {font-size:2em; font-weight:bold; background:none; padding:0em 0em 0em 0em; margin:0.4em 0em 0.2em 0em;}
+.wizard h2 {font-size:1.2em; font-weight:bold; background:none; padding:0em 0em 0em 0em; margin:0.4em 0em 0.2em 0em;}
+.wizardStep {padding:1em 1em 1em 1em;}
+.wizard .button {margin:0.5em 0em 0em 0em; font-size:1.2em;}
+.wizardFooter {padding:0.8em 0.4em 0.8em 0em;}
+.wizardFooter .status {padding:0em 0.4em 0em 0.4em; margin-left:1em;}
+.wizard .button {padding:0.1em 0.2em 0.1em 0.2em;}
+
+#messageArea {position:fixed; top:2em; right:0em; margin:0.5em; padding:0.5em; z-index:2000; _position:absolute;}
+.messageToolbar {display:block; text-align:right; padding:0.2em 0.2em 0.2em 0.2em;}
+#messageArea a {text-decoration:underline;}
+
+.tiddlerPopupButton {padding:0.2em 0.2em 0.2em 0.2em;}
+.popupTiddler {position: absolute; z-index:300; padding:1em 1em 1em 1em; margin:0;}
+
+.popup {position:absolute; z-index:300; font-size:.9em; padding:0; list-style:none; margin:0;}
+.popup .popupMessage {padding:0.4em;}
+.popup hr {display:block; height:1px; width:auto; padding:0; margin:0.2em 0em;}
+.popup li.disabled {padding:0.4em;}
+.popup li a {display:block; padding:0.4em; font-weight:normal; cursor:pointer;}
+.listBreak {font-size:1px; line-height:1px;}
+.listBreak div {margin:2px 0;}
+
+.tabset {padding:1em 0em 0em 0.5em;}
+.tab {margin:0em 0em 0em 0.25em; padding:2px;}
+.tabContents {padding:0.5em;}
+.tabContents ul, .tabContents ol {margin:0; padding:0;}
+.txtMainTab .tabContents li {list-style:none;}
+.tabContents li.listLink { margin-left:.75em;}
+
+#contentWrapper {display:block;}
+#splashScreen {display:none;}
+
+#displayArea {margin:1em 17em 0em 14em;}
+
+.toolbar {text-align:right; font-size:.9em;}
+
+.tiddler {padding:1em 1em 0em 1em;}
+
+.missing .viewer,.missing .title {font-style:italic;}
+
+.title {font-size:1.6em; font-weight:bold;}
+
+.missing .subtitle {display:none;}
+.subtitle {font-size:1.1em;}
+
+.tiddler .button {padding:0.2em 0.4em;}
+
+.tagging {margin:0.5em 0.5em 0.5em 0; float:left; display:none;}
+.isTag .tagging {display:block;}
+.tagged {margin:0.5em; float:right;}
+.tagging, .tagged {font-size:0.9em; padding:0.25em;}
+.tagging ul, .tagged ul {list-style:none; margin:0.25em; padding:0;}
+.tagClear {clear:both;}
+
+.footer {font-size:.9em;}
+.footer li {display:inline;}
+
+.annotation {padding:0.5em; margin:0.5em;}
+
+* html .viewer pre {width:99%; padding:0 0 1em 0;}
+.viewer {line-height:1.4em; padding-top:0.5em;}
+.viewer .button {margin:0em 0.25em; padding:0em 0.25em;}
+.viewer blockquote {line-height:1.5em; padding-left:0.8em;margin-left:2.5em;}
+.viewer ul, .viewer ol {margin-left:0.5em; padding-left:1.5em;}
+
+.viewer table, table.twtable {border-collapse:collapse; margin:0.8em 1.0em;}
+.viewer th, .viewer td, .viewer tr,.viewer caption,.twtable th, .twtable td, .twtable tr,.twtable caption {padding:3px;}
+table.listView {font-size:0.85em; margin:0.8em 1.0em;}
+table.listView th, table.listView td, table.listView tr {padding:0px 3px 0px 3px;}
+
+.viewer pre {padding:0.5em; margin-left:0.5em; font-size:1.2em; line-height:1.4em; overflow:auto;}
+.viewer code {font-size:1.2em; line-height:1.4em;}
+
+.editor {font-size:1.1em;}
+.editor input, .editor textarea {display:block; width:100%; font:inherit;}
+.editorFooter {padding:0.25em 0em; font-size:.9em;}
+.editorFooter .button {padding-top:0px; padding-bottom:0px;}
+
+.fieldsetFix {border:0; padding:0; margin:1px 0px 1px 0px;}
+
+.sparkline {line-height:1em;}
+.sparktick {outline:0;}
+
+.zoomer {font-size:1.1em; position:absolute; overflow:hidden;}
+.zoomer div {padding:1em;}
+
+* html #backstage {width:99%;}
+* html #backstageArea {width:99%;}
+#backstageArea {display:none; position:relative; overflow: hidden; z-index:150; padding:0.3em 0.5em 0.3em 0.5em;}
+#backstageToolbar {position:relative;}
+#backstageArea a {font-weight:bold; margin-left:0.5em; padding:0.3em 0.5em 0.3em 0.5em;}
+#backstageButton {display:none; position:absolute; z-index:175; top:0em; right:0em;}
+#backstageButton a {padding:0.1em 0.4em 0.1em 0.4em; margin:0.1em 0.1em 0.1em 0.1em;}
+#backstage {position:relative; width:100%; z-index:50;}
+#backstagePanel {display:none; z-index:100; position:absolute; margin:0em 3em 0em 3em; padding:1em 1em 1em 1em;}
+.backstagePanelFooter {padding-top:0.2em; float:right;}
+.backstagePanelFooter a {padding:0.2em 0.4em 0.2em 0.4em;}
+#backstageCloak {display:none; z-index:20; position:absolute; width:100%; height:100px;}
+
+.whenBackstage {display:none;}
+.backstageVisible .whenBackstage {display:block;}
+/*}}}*/</pre>
+</div>
+<div title="StyleSheetLocale">
+<pre>/***
+StyleSheet for use when a translation requires any css style changes.
+This StyleSheet can be used directly by languages such as Chinese, Japanese and Korean which use a logographic writing system and need larger font sizes.
+***/
+
+/*{{{*/
+body {font-size:0.8em;}
+
+#sidebarOptions {font-size:1.05em;}
+#sidebarOptions a {font-style:normal;}
+#sidebarOptions .sliderPanel {font-size:0.95em;}
+
+.subtitle {font-size:0.8em;}
+
+.viewer table.listView {font-size:0.95em;}
+
+.htmlarea .toolbarHA table {border:1px solid ButtonFace; margin:0em 0em;}
+/*}}}*/</pre>
+</div>
+<div title="StyleSheetPrint">
+<pre>/*{{{*/
+@media print {
+#mainMenu, #sidebar, #messageArea, .toolbar, #backstageButton {display: none ! important;}
+#displayArea {margin: 1em 1em 0em 1em;}
+/* Fixes a feature in Firefox 1.5.0.2 where print preview displays the noscript content */
+noscript {display:none;}
+}
+/*}}}*/</pre>
+</div>
+<div title="PageTemplate">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='header' macro='gradient vert [[ColorPalette::PrimaryLight]] [[ColorPalette::PrimaryMid]]'&gt;
+&lt;div class='headerShadow'&gt;
+&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+&lt;/div&gt;
+&lt;div class='headerForeground'&gt;
+&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;div id='mainMenu' refresh='content' tiddler='MainMenu'&gt;&lt;/div&gt;
+&lt;div id='sidebar'&gt;
+&lt;div id='sidebarOptions' refresh='content' tiddler='SideBarOptions'&gt;&lt;/div&gt;
+&lt;div id='sidebarTabs' refresh='content' force='true' tiddler='SideBarTabs'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;div id='displayArea'&gt;
+&lt;div id='messageArea'&gt;&lt;/div&gt;
+&lt;div id='tiddlerDisplay'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;!--}}}--&gt;</pre>
+</div>
+<div title="ViewTemplate">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='toolbar' macro='toolbar closeTiddler closeOthers +editTiddler &gt; fields syncing permalink references jump'&gt;&lt;/div&gt;
+&lt;div class='title' macro='view title'&gt;&lt;/div&gt;
+&lt;div class='subtitle'&gt;&lt;span macro='view modifier link'&gt;&lt;/span&gt;, &lt;span macro='view modified date'&gt;&lt;/span&gt; (&lt;span macro='message views.wikified.createdPrompt'&gt;&lt;/span&gt; &lt;span macro='view created date'&gt;&lt;/span&gt;)&lt;/div&gt;
+&lt;div class='tagging' macro='tagging'&gt;&lt;/div&gt;
+&lt;div class='tagged' macro='tags'&gt;&lt;/div&gt;
+&lt;div class='viewer' macro='view text wikified'&gt;&lt;/div&gt;
+&lt;div class='tagClear'&gt;&lt;/div&gt;
+&lt;!--}}}--&gt;</pre>
+</div>
+<div title="EditTemplate">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='toolbar' macro='toolbar +saveTiddler -cancelTiddler deleteTiddler'&gt;&lt;/div&gt;
+&lt;div class='title' macro='view title'&gt;&lt;/div&gt;
+&lt;div class='editor' macro='edit title'&gt;&lt;/div&gt;
+&lt;div macro='annotations'&gt;&lt;/div&gt;
+&lt;div class='editor' macro='edit text'&gt;&lt;/div&gt;
+&lt;div class='editor' macro='edit tags'&gt;&lt;/div&gt;&lt;div class='editorFooter'&gt;&lt;span macro='message views.editor.tagPrompt'&gt;&lt;/span&gt;&lt;span macro='tagChooser'&gt;&lt;/span&gt;&lt;/div&gt;
+&lt;!--}}}--&gt;</pre>
+</div>
+<div title="GettingStarted">
+<pre>To get started with this blank TiddlyWiki, you'll need to modify the following tiddlers:
+* SiteTitle &amp; SiteSubtitle: The title and subtitle of the site, as shown above (after saving, they will also appear in the browser title bar)
+* MainMenu: The menu (usually on the left)
+* DefaultTiddlers: Contains the names of the tiddlers that you want to appear when the TiddlyWiki is opened
+You'll also need to enter your username for signing your edits: &lt;&lt;option txtUserName&gt;&gt;</pre>
+</div>
+<div title="OptionsPanel">
+<pre>These InterfaceOptions for customising TiddlyWiki are saved in your browser
+
+Your username for signing your edits. Write it as a WikiWord (eg JoeBloggs)
+
+&lt;&lt;option txtUserName&gt;&gt;
+&lt;&lt;option chkSaveBackups&gt;&gt; SaveBackups
+&lt;&lt;option chkAutoSave&gt;&gt; AutoSave
+&lt;&lt;option chkRegExpSearch&gt;&gt; RegExpSearch
+&lt;&lt;option chkCaseSensitiveSearch&gt;&gt; CaseSensitiveSearch
+&lt;&lt;option chkAnimate&gt;&gt; EnableAnimations
+
+----
+Also see AdvancedOptions</pre>
+</div>
+</div>
+<!--POST-SHADOWAREA-->
+<div id="storeArea">
+<div title="1. The basics of the task macro" modifier="CehTeh" modified="200706100740" created="200604082224" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706100740">
+<pre>A task has a description, an estimate of how long it will take, and a record of how much time you have spent on it so far.  Here's an example, which shows a task estimated at 3 hours, with 1 hour spent on it, and ''2'' hours remaining:
+&lt;&lt;&lt;
+&lt;&lt;task 3 3 1&gt;&gt; Add a double-click handler to the description cell that opens the editor and selects the text
+&lt;&lt;&lt;
+If you hover the mouse over any part of the task -- the bullet, the description, or any of the numeric cells -- a tip will appear explaining it.
+
+Try modifying the time spent.  Suppose you've just spent one more hour and want to record it.  Just click on the second yellow cell, and enter &quot;+1&quot; (sans the quote marks, of course) in the popup window.  Watch the time remaining go down to 1 hour.
+
+In reality, I originally estimated this task at a half-hour, but it ended up taking 3.5 hours.  The macro also tracks your original estimate, if it is different from the current estimate, in a fourth cell like this:
+&lt;&lt;&lt;
+&lt;&lt;task 0.5 2 1&gt;&gt; Add a double-click handler to the description cell that opens the editor and selects the text
+&lt;&lt;&lt;
+You can adjust the current estimate in the same way as you adjusted the time spent.  Click on the current estimate cell (the first yellow cell), and change it to 2.5 hours by typing &quot;2.5&quot; or &quot;+.5&quot;.
+
+You can also adjust the time remaining, which will modify either the estimate (if the time remaining increases) or the time spent (if it decreases).  Click on the time remaining and add an hour by typing &quot;+1&quot;.
+
+When the time remaining goes to zero, the task is considered complete:
+&lt;&lt;&lt;
+&lt;&lt;task 0.5 3.5 3.5&gt;&gt; Add a double-click handler to the description cell that opens the editor and selects the text
+&lt;&lt;&lt;
+If you haven't already done so, try double-clicking the description.  Yes, it really does open up the editor and select just the text of the description.
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="2. More advanced use of the task macro" modifier="LukeBlanshard" modified="200604090319" created="200604082349" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200604090319">
+<pre>A task's description is a single wikified line, so it can contain any formatting that can be specified on one line:
+&lt;&lt;&lt;
+&lt;&lt;task 1&gt;&gt; Beef up the time click handlers to allow entry of ''two'' values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;task 0.5&gt;&gt; Put tasksum on the ViewTemplate.
+&lt;&lt;&lt;
+You can specify just the description of a task, and leave it unestimated.  Click the question mark to enter the estimate:
+&lt;&lt;&lt;
+&lt;&lt;task&gt;&gt; Beef up the time click handlers to allow entry of ''two'' values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;&lt;
+As this task implies, you can enter two values in the popup when you click on any of the time cells.  Separate them with spaces and/or a comma.  Experiment:
+&lt;&lt;&lt;
+&lt;&lt;task 1&gt;&gt; Beef up the time click handlers to allow entry of ''two'' values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;&lt;
+Finally, if you haven't already figured this out, you can double-click on a task's bullet to mark it complete, with the current estimate entered as the time spent.
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="3. The taskadder macro: add tasks easily" modifier="LukeBlanshard" modified="200605020243" created="200604082241" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605020243">
+<pre>If you've been paying attention, you've noticed that I haven't discussed the actual adding of calls to the task macro within your tiddlers -- it's all been about modifying tasks that were already there.  That's because adding tasks via the taskadder macro is much easier and more intuitive than adding them by hand.
+
+And setting up a taskadder is simplicity itself.  Just add {{{&lt;&lt;taskadder&gt;&gt;}}} to your tiddler.  You will see this:
+&lt;&lt;&lt;
+&lt;&lt;taskadder&gt;&gt;
+&lt;&lt;&lt;
+Just type a task description into the first field, and your initial estimate for how long it will take into the second field.  Click the &quot;add task&quot; button, or just hit Enter in either of the fields, to add the new task into the tiddler.  Notice that you can just start typing a new task as soon as you're done entering the first one.
+
+You can have as many taskadders as you like in any tiddler.  The last one you used will capture the keyboard focus when it is redisplayed, meaning you can type a series of tasks without using the mouse.  Try adding some tasks here and in the above adder:
+&lt;&lt;&lt;
+&lt;&lt;taskadder&gt;&gt;
+&lt;&lt;&lt;
+Notice that the one you just used takes focus when this tiddler is redisplayed.
+
+A taskadder by default adds tasks above itself.  You can make it add them below by adding a {{{below}}} argument to the macro call:
+&lt;&lt;&lt;
+&lt;&lt;taskadder below&gt;&gt;
+&lt;&lt;&lt;
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="4. The tasksum macro: summarize tasks" modifier="LukeBlanshard" modified="200605020248" created="200604082241" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605020248">
+<pre>In this tutorial, we've been looking mostly at individual tasks.  In real life, though, you'll typically have a series of them, or even several series of them in the same tiddler.  In these cases you want a summary that tells you -- at a minimum -- how much time you still expect to spend on these tasks.
+
+To get such a summary, just add {{{&lt;&lt;tasksum start&gt;&gt;}}} before the tasks and {{{&lt;&lt;tasksum end&gt;&gt;}}} after them.  Here's an example:
+&lt;&lt;&lt;
+&lt;&lt;tasksum start&gt;&gt;
+&lt;&lt;task 0.25 0.25 0.25&gt;&gt; Add tooltips to the various cells
+&lt;&lt;task 1 0.75 0.75&gt;&gt; Figure out how to add auto-updating click handlers to the time cells
+&lt;&lt;task 2 2 0&gt;&gt; Add simple click handlers to cur, spent, rem: just allow direct setting of values
+&lt;&lt;task 1 3.5 2.5&gt;&gt; Add a double-click handler to the desc cell that opens the editor and selects the text
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to allow entry of two values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to handle leading + or -
+&lt;&lt;task 1 1 0&gt;&gt; Add a double-click handler to the status cell that functions like typing 0 into the rem cell
+&lt;&lt;tasksum end&gt;&gt;
+&lt;&lt;&lt;
+If you'd rather have the summary at the top, just add {{{here}}} to the start call, ie {{{&lt;&lt;tasksum start here&gt;&gt;}}}.
+&lt;&lt;&lt;
+&lt;&lt;tasksum start here&gt;&gt;
+&lt;&lt;task 0.25 0.25 0.25&gt;&gt; Add tooltips to the various cells
+&lt;&lt;task 1 0.75 0.75&gt;&gt; Figure out how to add auto-updating click handlers to the time cells
+&lt;&lt;task 2 2 0&gt;&gt; Add simple click handlers to cur, spent, rem: just allow direct setting of values
+&lt;&lt;tasksum end&gt;&gt;
+&lt;&lt;&lt;
+You can nest these things if you like, just be sure to match starts and ends:
+&lt;&lt;&lt;
+&lt;&lt;tasksum start here&gt;&gt;
+* Time cell manipulation:&lt;&lt;tasksum start&gt;&gt;
+&lt;&lt;task 1 0.75 0.75&gt;&gt; Figure out how to add auto-updating click handlers to the time cells
+&lt;&lt;task 2 2 0&gt;&gt; Add simple click handlers to cur, spent, rem: just allow direct setting of values
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to allow entry of two values each: cur&amp;spent, spent&amp;rem. Add click handler to done tasks' spent cells too, to reopen them (like with +0, 1).
+&lt;&lt;task 1 1 0&gt;&gt; Beef up the time click handlers to handle leading + or -
+&lt;&lt;tasksum end &quot;Cell manipulation:&quot;&gt;&gt;
+&lt;&lt;br&gt;&gt;
+* Double-click handling:&lt;&lt;tasksum start&gt;&gt;
+&lt;&lt;task 1 3.5 2.5&gt;&gt; Add a double-click handler to the desc cell that opens the editor and selects the text
+&lt;&lt;task 1 1 0&gt;&gt; Add a double-click handler to the status cell that functions like typing 0 into the rem cell
+&lt;&lt;tasksum end &quot;Double-clicks:&quot;&gt;&gt;
+
+&lt;&lt;tasksum end&gt;&gt;
+&lt;&lt;&lt;
+Finally, the simplest way to use tasksum is to add it to your view template.  See TaskSummaryViewTemplate for an example template.  Note that if no tasks are present between the start and end, nothing is displayed.
+
+----
+To continue, click the down-arrow and choose another section: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="5. Task macro installation issues" modifier="LukeBlanshard" modified="200605132015" created="200604082243" tags="TaskMacroTutorial" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605132015">
+<pre>The TaskMacroPlugin can be installed like any other TiddlyWiki plugin, and used without further effort.  However, there are two issues that may affect you.  (To get started with a brand new wiki that does not have these issues, consider downloading the [[empty LabWiki|empty_labwiki.html]].)
+# The task macros don't play nicely with the default TiddlyWiki display of tags.  In the default view template, a tiddler's list of tags is shown in a little box that floats in the upper right corner of the tiddler.  However, this little box may interfere with the tables used by the task macros.  In Firefox, the tables are drawn right over the top of the tag box, rendering both of them illegible.  In Internet Explorer, the tag box forces the tables to be pushed down below the box, which can waste a lot of space.&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;Thus, I recommend changing your view template to eliminate the little box.  If you use Simon Baird's [[TagglyTagging|http://simonbaird.com/mptw/#TagglyTagging]] (as LabWiki does), then my TaskSummaryViewTemplate might be a good alternative.  Simply import it into your wiki and rename it to ViewTemplate.  This template also demonstrates how to incorporate the tasksum macro into every tiddler so any tiddler with tasks has a summary at the top.&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;
+# Most view templates also add a minus sign (&quot;-&quot;) before the &quot;close&quot; command.  TiddlyWiki interprets this to mean that you want the close command to be executed if you hit the Escape key from within the tiddler.&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;However, most tiddlers never have focus, and so never give you the opportunity to try it out.  But if you have a taskadder in your tiddler, then you suddenly enable this feature -- and you probably don't want it.  It means that if you type a nice long task description and then hit Escape, that description will be lost and the tiddler will be closed.  So I recommend that you remove the minus sign from the view template's menu altogether, as I have done in LabWiki's own ViewTemplate.
+
+----
+This ends the tutorial.  To go back to any previous section, click the down-arrow and choose it: &lt;&lt;tag TaskMacroTutorial&gt;&gt;</pre>
+</div>
+<div title="Admin" modifier="CehTeh" modified="200706110324" created="200706080535" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706110324">
+<pre>PageTemplate
+|&gt;|SiteTitle - SiteSubtitle|
+|&gt;|MainMenu|
+|DefaultTiddlers&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;ViewTemplate&lt;&lt;br&gt;&gt;&lt;&lt;br&gt;&gt;EditTemplate|SideBarOptions|
+|~|OptionsPanel|
+|~|SideBarTabs|
+|~|AdvancedOptions|
+|~|&lt;&lt;tiddler Configuration.SideBarTabs&gt;&gt;|
+
+''StyleSheet:'' StyleSheetColors - StyleSheetLayout - StyleSheetPrint
+
+ColorPalette
+
+SiteUrl</pre>
+</div>
+<div title="BetterTimelineMacro" modifier="Saq" modified="200701030924" created="200607280926" tags="lewcidExtension systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200701030924">
+<pre>/***
+|Name|BetterTimelineMacro|
+|Created by|SaqImtiaz|
+|Location|http://tw.lewcid.org/#BetterTimelineMacro|
+|Version|0.5 beta|
+|Requires|~TW2.x|
+!!!Description:
+A replacement for the core timeline macro that offers more features:
+*list tiddlers with only specfic tag
+*exclude tiddlers with a particular tag
+*limit entries to any number of days, for example one week
+*specify a start date for the timeline, only tiddlers after that date will be listed.
+
+!!!Installation:
+Copy the contents of this tiddler to your TW, tag with systemConfig, save and reload your TW.
+Edit the ViewTemplate to add the fullscreen command to the toolbar.
+
+!!!Syntax:
+{{{&lt;&lt;timeline better:true&gt;&gt;}}}
+''the param better:true enables the advanced features, without it you will get the old timeline behaviour.''
+
+additonal params:
+(use only the ones you want)
+{{{&lt;&lt;timeline better:true  onlyTag:Tag1 excludeTag:Tag2 sortBy:modified/created firstDay:YYYYMMDD maxDays:7 maxEntries:30&gt;&gt;}}}
+
+''explanation of syntax:''
+onlyTag: only tiddlers with this tag will be listed. Default is to list all tiddlers.
+excludeTag: tiddlers with this tag will not be listed.
+sortBy: sort tiddlers by date modified or date created. Possible values are modified or created.
+firstDay: useful for starting timeline from a specific date. Example: 20060701 for 1st of July, 2006
+maxDays: limits timeline to include only tiddlers from the specified number of days. If you use a value of 7 for example, only tiddlers from the last 7 days will be listed.
+maxEntries: limit the total number of entries in the timeline.
+
+
+!!!History:
+*28-07-06: ver 0.5 beta, first release
+
+!!!Code
+***/
+//{{{
+// Return the tiddlers as a sorted array
+TiddlyWiki.prototype.getTiddlers = function(field,excludeTag,includeTag)
+{
+          var results = [];
+          this.forEachTiddler(function(title,tiddler)
+          {
+          if(excludeTag == undefined || tiddler.tags.find(excludeTag) == null)
+                        if(includeTag == undefined || tiddler.tags.find(includeTag)!=null)
+                                      results.push(tiddler);
+          });
+          if(field)
+                   results.sort(function (a,b) {if(a[field] == b[field]) return(0); else return (a[field] &lt; b[field]) ? -1 : +1; });
+          return results;
+}
+
+
+
+//this function by Udo
+function getParam(params, name, defaultValue)
+{
+          if (!params)
+          return defaultValue;
+          var p = params[0][name];
+          return p ? p[0] : defaultValue;
+}
+
+window.old_timeline_handler= config.macros.timeline.handler;
+config.macros.timeline.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+          var args = paramString.parseParams(&quot;list&quot;,null,true);
+          var betterMode = getParam(args, &quot;better&quot;, &quot;false&quot;);
+          if (betterMode == 'true')
+          {
+          var sortBy = getParam(args,&quot;sortBy&quot;,&quot;modified&quot;);
+          var excludeTag = getParam(args,&quot;excludeTag&quot;,undefined);
+          var includeTag = getParam(args,&quot;onlyTag&quot;,undefined);
+          var tiddlers = store.getTiddlers(sortBy,excludeTag,includeTag);
+          var firstDayParam = getParam(args,&quot;firstDay&quot;,undefined);
+          var firstDay = (firstDayParam!=undefined)? firstDayParam: &quot;00010101&quot;;
+          var lastDay = &quot;&quot;;
+          var field= sortBy;
+          var maxDaysParam = getParam(args,&quot;maxDays&quot;,undefined);
+          var maxDays = (maxDaysParam!=undefined)? maxDaysParam*24*60*60*1000: (new Date()).getTime() ;
+          var maxEntries = getParam(args,&quot;maxEntries&quot;,undefined);
+          var last = (maxEntries!=undefined) ? tiddlers.length-Math.min(tiddlers.length,parseInt(maxEntries)) : 0;
+          for(var t=tiddlers.length-1; t&gt;=last; t--)
+                  {
+                  var tiddler = tiddlers[t];
+                  var theDay = tiddler[field].convertToLocalYYYYMMDDHHMM().substr(0,8);
+                  if ((theDay&gt;=firstDay)&amp;&amp; (tiddler[field].getTime()&gt; (new Date()).getTime() - maxDays))
+                     {
+                     if(theDay != lastDay)
+                               {
+                               var theDateList = document.createElement(&quot;ul&quot;);
+                               place.appendChild(theDateList);
+                               createTiddlyElement(theDateList,&quot;li&quot;,null,&quot;listTitle&quot;,tiddler[field].formatString(this.dateFormat));
+                               lastDay = theDay;
+                               }
+                  var theDateListItem = createTiddlyElement(theDateList,&quot;li&quot;,null,&quot;listLink&quot;,null);
+                  theDateListItem.appendChild(createTiddlyLink(place,tiddler.title,true));
+                  }
+                  }
+          }
+
+          else
+              {
+              window.old_timeline_handler.apply(this,arguments);
+              }
+}
+//}}}</pre>
+</div>
+<div title="ColorPalette" modifier="CehTeh" modified="200803281322" created="200803281320" changecount="5">
+<pre>Background: #fff
+Foreground: #000
+PrimaryPale: #aaa
+PrimaryLight: #f00
+PrimaryMid: #400
+PrimaryDark: #000
+SecondaryPale: #ffc
+SecondaryLight: #fe8
+SecondaryMid: #db4
+SecondaryDark: #841
+TertiaryPale: #eee
+TertiaryLight: #ccc
+TertiaryMid: #999
+TertiaryDark: #666
+Error: #f88</pre>
+</div>
+<div title="DefaultTiddlers" modifier="CehTeh" created="200803281310" changecount="1">
+<pre>[[Overview]]</pre>
+</div>
+<div title="FullScreenPlugin" modifier="CehTeh" modified="200706110313" created="200607241016" tags="systemConfig lewcidExtension" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706110313">
+<pre>/***
+|Name|FullScreenPlugin|
+|Created by|SaqImtiaz|
+|Location|http://tw.lewcid.org/#FullScreenPlugin|
+|Version|1.1|
+|Requires|~TW2.x|
+!Description:
+Toggle between viewing tiddlers fullscreen and normally. Very handy for when you need more viewing space.
+
+!Demo:
+Click the ↕ button in the toolbar for this tiddler. Click it again to turn off fullscreen.
+
+!Installation:
+Copy the contents of this tiddler to your TW, tag with systemConfig, save and reload your TW.
+Edit the ViewTemplate to add the fullscreen command to the toolbar.
+
+!History:
+*25-07-06: ver 1.1
+*20-07-06: ver 1.0
+
+!Code
+***/
+//{{{
+var lewcidFullScreen = false;
+
+config.commands.fullscreen =
+{
+            text:&quot; ↕ &quot;,
+            tooltip:&quot;Fullscreen mode&quot;
+};
+
+config.commands.fullscreen.handler = function (event,src,title)
+{
+            if (lewcidFullScreen == false)
+               {
+                lewcidFullScreen = true;
+                setStylesheet('#sidebar, .header, #mainMenu{display:none;} #displayArea{margin:0em 0 0 0 !important;}',&quot;lewcidFullScreenStyle&quot;);
+               }
+            else
+               {
+                lewcidFullScreen = false;
+                setStylesheet(' ',&quot;lewcidFullScreenStyle&quot;);
+               }
+}
+
+config.macros.fullscreen={};
+config.macros.fullscreen.handler =  function(place,macroName,params,wikifier,paramString,tiddler)
+{
+        var label = params[0]||&quot; ↕ &quot;;
+        var tooltip = params[1]||&quot;Fullscreen mode&quot;;
+        createTiddlyButton(place,label,tooltip,config.commands.fullscreen.handler);
+}
+
+var lewcid_fullscreen_closeTiddler = Story.prototype.closeTiddler;
+Story.prototype.closeTiddler =function(title,animate,slowly)
+{
+           lewcid_fullscreen_closeTiddler.apply(this,arguments);
+           if (story.isEmpty() &amp;&amp; lewcidFullScreen == true)
+              config.commands.fullscreen.handler();
+}
+
+
+Slider.prototype.lewcidStop = Slider.prototype.stop;
+Slider.prototype.stop = function()
+{
+           this.lewcidStop();
+           if (story.isEmpty() &amp;&amp; lewcidFullScreen == true)
+              config.commands.fullscreen.handler();
+}
+//}}}</pre>
+</div>
+<div title="InlineJavaScript" modifier="Jeremy" created="200603090618" tags="systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200603090618">
+<pre>/***
+''InlineJavascriptPlugin for ~TiddlyWiki version 1.2.x and 2.0''
+^^author: Eric Shulman - ELS Design Studios
+source: http://www.TiddlyTools.com/#InlineJavascriptPlugin
+license: [[Creative Commons Attribution-ShareAlike 2.5 License|http://creativecommons.org/licenses/by-sa/2.5/]]^^
+
+Insert Javascript executable code directly into your tiddler content. Lets you ''call directly into TW core utility routines, define new functions, calculate values, add dynamically-generated TiddlyWiki-formatted output'' into tiddler content, or perform any other programmatic actions each time the tiddler is rendered.
+!!!!!Usage
+&lt;&lt;&lt;
+When installed, this plugin adds new wiki syntax for surrounding tiddler content with {{{&lt;script&gt;}}} and {{{&lt;/script&gt;}}} markers, so that it can be treated as embedded javascript and executed each time the tiddler is rendered.
+
+''Deferred execution from an 'onClick' link''
+By including a label=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker, the plugin will create a link to an 'onclick' script that will only be executed when that specific link is clicked, rather than running the script each time the tiddler is rendered.
+
+''External script source files:''
+You can also load javascript from an external source URL, by including a src=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker (e.g., {{{&lt;script src=&quot;demo.js&quot;&gt;&lt;/script&gt;}}}). This is particularly useful when incorporating third-party javascript libraries for use in custom extensions and plugins. The 'foreign' javascript code remains isolated in a separate file that can be easily replaced whenever an updated library file becomes available.
+
+''Defining javascript functions and libraries:''
+Although the external javascript file is loaded while the tiddler content is being rendered, any functions it defines will not be available for use until //after// the rendering has been completed. Thus, you cannot load a library and //immediately// use it's functions within the same tiddler. However, once that tiddler has been loaded, the library functions can be freely used in any tiddler (even the one in which it was initially loaded).
+
+To ensure that your javascript functions are always available when needed, you should load the libraries from a tiddler that will be rendered as soon as your TiddlyWiki document is opened. For example, you could put your {{{&lt;script src=&quot;...&quot;&gt;&lt;/script&gt;}}} syntax into a tiddler called LoadScripts, and then add {{{&lt;&lt;tiddler LoadScripts&gt;&gt;}}} in your MainMenu tiddler.
+
+Since the MainMenu is always rendered immediately upon opening your document, the library will always be loaded before any other tiddlers that rely upon the functions it defines. Loading an external javascript library does not produce any direct output in the tiddler, so these definitions should have no impact on the appearance of your MainMenu.
+
+''Creating dynamic tiddler content''
+An important difference between this implementation of embedded scripting and conventional embedded javascript techniques for web pages is the method used to produce output that is dynamically inserted into the document:
+* In a typical web document, you use the document.write() function to output text sequences (often containing HTML tags) that are then rendered when the entire document is first loaded into the browser window.
+* However, in a ~TiddlyWiki document, tiddlers (and other DOM elements) are created, deleted, and rendered &quot;on-the-fly&quot;, so writing directly to the global 'document' object does not produce the results you want (i.e., replacing the embedded script within the tiddler content), and completely replaces the entire ~TiddlyWiki document in your browser window.
+* To allow these scripts to work unmodified, the plugin automatically converts all occurences of document.write() so that the output is inserted into the tiddler content instead of replacing the entire ~TiddlyWiki document.
+
+If your script does not use document.write() to create dynamically embedded content within a tiddler, your javascript can, as an alternative, explicitly return a text value that the plugin can then pass through the wikify() rendering engine to insert into the tiddler display. For example, using {{{return &quot;thistext&quot;}}} will produce the same output as {{{document.write(&quot;thistext&quot;)}}}.
+
+//Note: your script code is automatically 'wrapped' inside a function, {{{_out()}}}, so that any return value you provide can be correctly handled by the plugin and inserted into the tiddler. To avoid unpredictable results (and possibly fatal execution errors), this function should never be redefined or called from ''within'' your script code.//
+
+''Accessing the ~TiddlyWiki DOM''
+The plugin provides one pre-defined variable, 'place', that is passed in to your javascript code so that it can have direct access to the containing DOM element into which the tiddler output is currently being rendered.
+
+Access to this DOM element allows you to create scripts that can:
+* vary their actions based upon the specific location in which they are embedded
+* access 'tiddler-relative' information (use findContainingTiddler(place))
+* perform direct DOM manipulations (when returning wikified text is not enough)
+&lt;&lt;&lt;
+!!!!!Examples
+&lt;&lt;&lt;
+an &quot;alert&quot; message box:
+{{{
+&lt;script&gt;alert('InlineJavascriptPlugin: this is a demonstration message');&lt;/script&gt;
+}}}
+&lt;script&gt;alert('InlineJavascriptPlugin: this is a demonstration message');&lt;/script&gt;
+
+dynamic output:
+{{{
+&lt;script&gt;return (new Date()).toString();&lt;/script&gt;
+}}}
+&lt;script&gt;return (new Date()).toString();&lt;/script&gt;
+
+wikified dynamic output:
+{{{
+&lt;script&gt;return &quot;link to current user: [[&quot;+config.options.txtUserName+&quot;]]&quot;;&lt;/script&gt;
+}}}
+&lt;script&gt;return &quot;link to current user: [[&quot;+config.options.txtUserName+&quot;]]&quot;;&lt;/script&gt;
+
+dynamic output using 'place' to get size information for current tiddler
+{{{
+&lt;script&gt;
+ if (!window.story) window.story=window;
+ var title=story.findContainingTiddler(place).id.substr(7);
+ return title+&quot; is using &quot;+store.getTiddlerText(title).length+&quot; bytes&quot;;
+&lt;/script&gt;
+}}}
+&lt;script&gt;
+ if (!window.story) window.story=window;
+ var title=story.findContainingTiddler(place).id.substr(7);
+ return title+&quot; is using &quot;+store.getTiddlerText(title).length+&quot; bytes&quot;;
+&lt;/script&gt;
+
+creating an 'onclick' button/link that runs a script
+{{{
+&lt;script label=&quot;click here&quot;&gt;
+ if (!window.story) window.story=window;
+ alert(&quot;Hello World!\nlinktext='&quot;+place.firstChild.data+&quot;'\ntiddler='&quot;+story.findContainingTiddler(place).id.substr(7)+&quot;'&quot;);
+&lt;/script&gt;
+}}}
+&lt;script label=&quot;click here&quot;&gt;
+ if (!window.story) window.story=window;
+ alert(&quot;Hello World!\nlinktext='&quot;+place.firstChild.data+&quot;'\ntiddler='&quot;+story.findContainingTiddler(place).id.substr(7)+&quot;'&quot;);
+&lt;/script&gt;
+
+loading a script from a source url
+{{{
+&lt;script src=&quot;demo.js&quot;&gt;return &quot;loading demo.js...&quot;&lt;/script&gt;
+&lt;script label=&quot;click to execute demo() function&quot;&gt;demo()&lt;/script&gt;
+}}}
+where http://www.TiddlyTools.com/demo.js contains:
+&gt;function demo() { alert('this output is from demo(), defined in demo.js') }
+&gt;alert('InlineJavascriptPlugin: demo.js has been loaded');
+&lt;script src=&quot;demo.js&quot;&gt;return &quot;loading demo.js...&quot;&lt;/script&gt;
+&lt;script label=&quot;click to execute demo() function&quot;&gt;demo()&lt;/script&gt;
+&lt;&lt;&lt;
+!!!!!Installation
+&lt;&lt;&lt;
+import (or copy/paste) the following tiddlers into your document:
+''InlineJavascriptPlugin'' (tagged with &lt;&lt;tag systemConfig&gt;&gt;)
+&lt;&lt;&lt;
+!!!!!Revision History
+&lt;&lt;&lt;
+''2006.01.05 [1.4.0]''
+added support 'onclick' scripts. When label=&quot;...&quot; param is present, a button/link is created using the indicated label text, and the script is only executed when the button/link is clicked. 'place' value is set to match the clicked button/link element.
+''2005.12.13 [1.3.1]''
+when catching eval error in IE, e.description contains the error text, instead of e.toString(). Fixed error reporting so IE shows the correct response text. Based on a suggestion by UdoBorkowski
+''2005.11.09 [1.3.0]''
+for 'inline' scripts (i.e., not scripts loaded with src=&quot;...&quot;), automatically replace calls to 'document.write()' with 'place.innerHTML+=' so script output is directed into tiddler content
+Based on a suggestion by BradleyMeck
+''2005.11.08 [1.2.0]''
+handle loading of javascript from an external URL via src=&quot;...&quot; syntax
+''2005.11.08 [1.1.0]''
+pass 'place' param into scripts to provide direct DOM access 
+''2005.11.08 [1.0.0]''
+initial release
+&lt;&lt;&lt;
+!!!!!Credits
+&lt;&lt;&lt;
+This feature was developed by EricShulman from [[ELS Design Studios|http:/www.elsdesign.com]]
+&lt;&lt;&lt;
+!!!!!Code
+***/
+//{{{
+version.extensions.inlineJavascript= {major: 1, minor: 4, revision: 0, date: new Date(2006,1,5)};
+
+config.formatters.push( {
+ name: &quot;inlineJavascript&quot;,
+ match: &quot;\\&lt;script&quot;,
+ lookahead: &quot;\\&lt;script(?: src=\\\&quot;((?:.|\\n)*?)\\\&quot;)?(?: label=\\\&quot;((?:.|\\n)*?)\\\&quot;)?\\&gt;((?:.|\\n)*?)\\&lt;/script\\&gt;&quot;,
+
+ handler: function(w) {
+ var lookaheadRegExp = new RegExp(this.lookahead,&quot;mg&quot;);
+ lookaheadRegExp.lastIndex = w.matchStart;
+ var lookaheadMatch = lookaheadRegExp.exec(w.source)
+ if(lookaheadMatch &amp;&amp; lookaheadMatch.index == w.matchStart) {
+ if (lookaheadMatch[1]) { // load a script library
+ // make script tag, set src, add to body to execute, then remove for cleanup
+ var script = document.createElement(&quot;script&quot;); script.src = lookaheadMatch[1];
+ document.body.appendChild(script); document.body.removeChild(script);
+ }
+ if (lookaheadMatch[2] &amp;&amp; lookaheadMatch[3]) { // create a link to an 'onclick' script
+ // add a link, define click handler, save code in link (pass 'place'), set link attributes
+ var link=createTiddlyElement(w.output,&quot;a&quot;,null,&quot;tiddlyLinkExisting&quot;,lookaheadMatch[2]);
+ link.onclick=function(){try{return(eval(this.code))}catch(e){alert(e.description?e.description:e.toString())}}
+ link.code=&quot;function _out(place){&quot;+lookaheadMatch[3]+&quot;};_out(this);&quot;
+ link.setAttribute(&quot;href&quot;,&quot;javascript:;&quot;); link.setAttribute(&quot;title&quot;,&quot;&quot;); link.style.cursor=&quot;pointer&quot;;
+ }
+ else if (lookaheadMatch[3]) { // run inline script code
+ var code=&quot;function _out(place){&quot;+lookaheadMatch[3]+&quot;};_out(w.output);&quot;
+ code=code.replace(/document.write\(/gi,'place.innerHTML+=(');
+ try { var out = eval(code); } catch(e) { out = e.description?e.description:e.toString(); }
+ if (out &amp;&amp; out.length) wikify(out,w.output);
+ }
+ w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+ }
+ }
+} )
+//}}}
+</pre>
+</div>
+<div title="InlineJavascriptPlugin" modifier="PauloSoares" modified="200609302108" created="200512130544" tags="plugin excludeLists systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200609302108">
+<pre>/***
+|''Name:''|InlineJavascriptPlugin|
+|''Source:''|http://www.TiddlyTools.com/#InlineJavascriptPlugin|
+|''Author:''|Eric Shulman - ELS Design Studios|
+|''License:''|[[Creative Commons Attribution-ShareAlike 2.5 License|http://creativecommons.org/licenses/by-sa/2.5/]]|
+|''~CoreVersion:''|2.0.10|
+
+Insert Javascript executable code directly into your tiddler content. Lets you ''call directly into TW core utility routines, define new functions, calculate values, add dynamically-generated TiddlyWiki-formatted output'' into tiddler content, or perform any other programmatic actions each time the tiddler is rendered.
+!!!!!Usage
+&lt;&lt;&lt;
+When installed, this plugin adds new wiki syntax for surrounding tiddler content with {{{&lt;script&gt;}}} and {{{&lt;/script&gt;}}} markers, so that it can be treated as embedded javascript and executed each time the tiddler is rendered.
+
+''Deferred execution from an 'onClick' link''
+By including a label=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker, the plugin will create a link to an 'onclick' script that will only be executed when that specific link is clicked, rather than running the script each time the tiddler is rendered.
+
+''External script source files:''
+You can also load javascript from an external source URL, by including a src=&quot;...&quot; parameter in the initial {{{&lt;script&gt;}}} marker (e.g., {{{&lt;script src=&quot;demo.js&quot;&gt;&lt;/script&gt;}}}). This is particularly useful when incorporating third-party javascript libraries for use in custom extensions and plugins. The 'foreign' javascript code remains isolated in a separate file that can be easily replaced whenever an updated library file becomes available.
+
+''Display script source in tiddler output''
+By including the keyword parameter &quot;show&quot;, in the initial {{{&lt;script&gt;}}} marker, the plugin will include the script source code in the output that it displays in the tiddler.
+
+''Defining javascript functions and libraries:''
+Although the external javascript file is loaded while the tiddler content is being rendered, any functions it defines will not be available for use until //after// the rendering has been completed. Thus, you cannot load a library and //immediately// use it's functions within the same tiddler. However, once that tiddler has been loaded, the library functions can be freely used in any tiddler (even the one in which it was initially loaded).
+
+To ensure that your javascript functions are always available when needed, you should load the libraries from a tiddler that will be rendered as soon as your TiddlyWiki document is opened. For example, you could put your {{{&lt;script src=&quot;...&quot;&gt;&lt;/script&gt;}}} syntax into a tiddler called LoadScripts, and then add {{{&lt;&lt;tiddler LoadScripts&gt;&gt;}}} in your MainMenu tiddler.
+
+Since the MainMenu is always rendered immediately upon opening your document, the library will always be loaded before any other tiddlers that rely upon the functions it defines. Loading an external javascript library does not produce any direct output in the tiddler, so these definitions should have no impact on the appearance of your MainMenu.
+
+''Creating dynamic tiddler content''
+An important difference between this implementation of embedded scripting and conventional embedded javascript techniques for web pages is the method used to produce output that is dynamically inserted into the document:
+* In a typical web document, you use the document.write() function to output text sequences (often containing HTML tags) that are then rendered when the entire document is first loaded into the browser window.
+* However, in a ~TiddlyWiki document, tiddlers (and other DOM elements) are created, deleted, and rendered &quot;on-the-fly&quot;, so writing directly to the global 'document' object does not produce the results you want (i.e., replacing the embedded script within the tiddler content), and completely replaces the entire ~TiddlyWiki document in your browser window.
+* To allow these scripts to work unmodified, the plugin automatically converts all occurences of document.write() so that the output is inserted into the tiddler content instead of replacing the entire ~TiddlyWiki document.
+
+If your script does not use document.write() to create dynamically embedded content within a tiddler, your javascript can, as an alternative, explicitly return a text value that the plugin can then pass through the wikify() rendering engine to insert into the tiddler display. For example, using {{{return &quot;thistext&quot;}}} will produce the same output as {{{document.write(&quot;thistext&quot;)}}}.
+
+//Note: your script code is automatically 'wrapped' inside a function, {{{_out()}}}, so that any return value you provide can be correctly handled by the plugin and inserted into the tiddler. To avoid unpredictable results (and possibly fatal execution errors), this function should never be redefined or called from ''within'' your script code.//
+
+''Accessing the ~TiddlyWiki DOM''
+The plugin provides one pre-defined variable, 'place', that is passed in to your javascript code so that it can have direct access to the containing DOM element into which the tiddler output is currently being rendered.
+
+Access to this DOM element allows you to create scripts that can:
+* vary their actions based upon the specific location in which they are embedded
+* access 'tiddler-relative' information (use findContainingTiddler(place))
+* perform direct DOM manipulations (when returning wikified text is not enough)
+&lt;&lt;&lt;
+!!!!!Examples
+&lt;&lt;&lt;
+an &quot;alert&quot; message box:
+&gt;&lt;script show&gt;
+ alert('InlineJavascriptPlugin: this is a demonstration message');
+&lt;/script&gt;
+dynamic output:
+&gt;&lt;script show&gt;
+ return (new Date()).toString();
+&lt;/script&gt;
+wikified dynamic output:
+&gt;&lt;script show&gt;
+ return &quot;link to current user: [[&quot;+config.options.txtUserName+&quot;]]&quot;;
+&lt;/script&gt;
+dynamic output using 'place' to get size information for current tiddler:
+&gt;&lt;script show&gt;
+ if (!window.story) window.story=window;
+ var title=story.findContainingTiddler(place).id.substr(7);
+ return title+&quot; is using &quot;+store.getTiddlerText(title).length+&quot; bytes&quot;;
+&lt;/script&gt;
+creating an 'onclick' button/link that runs a script:
+&gt;&lt;script label=&quot;click here&quot; show&gt;
+ if (!window.story) window.story=window;
+ alert(&quot;Hello World!\nlinktext='&quot;+place.firstChild.data+&quot;'\ntiddler='&quot;+story.findContainingTiddler(place).id.substr(7)+&quot;'&quot;);
+&lt;/script&gt;
+loading a script from a source url:
+&gt;http://www.TiddlyTools.com/demo.js contains:
+&gt;&gt;{{{function demo() { alert('this output is from demo(), defined in demo.js') } }}}
+&gt;&gt;{{{alert('InlineJavascriptPlugin: demo.js has been loaded'); }}}
+&gt;&lt;script src=&quot;demo.js&quot; show&gt;
+ return &quot;loading demo.js...&quot;
+&lt;/script&gt;
+&gt;&lt;script label=&quot;click to execute demo() function&quot; show&gt;
+ demo()
+&lt;/script&gt;
+&lt;&lt;&lt;
+!!!!!Installation
+&lt;&lt;&lt;
+import (or copy/paste) the following tiddlers into your document:
+''InlineJavascriptPlugin'' (tagged with &lt;&lt;tag systemConfig&gt;&gt;)
+&lt;&lt;&lt;
+!!!!!Revision History
+&lt;&lt;&lt;
+''2006.06.01 [1.5.1]'' when calling wikify() on script return value, pass hightlightRegExp and tiddler params so macros that rely on these values can render properly
+''2006.04.19 [1.5.0]'' added 'show' parameter to force display of javascript source code in tiddler output
+''2006.01.05 [1.4.0]'' added support 'onclick' scripts. When label=&quot;...&quot; param is present, a button/link is created using the indicated label text, and the script is only executed when the button/link is clicked. 'place' value is set to match the clicked button/link element.
+''2005.12.13 [1.3.1]'' when catching eval error in IE, e.description contains the error text, instead of e.toString(). Fixed error reporting so IE shows the correct response text. Based on a suggestion by UdoBorkowski
+''2005.11.09 [1.3.0]'' for 'inline' scripts (i.e., not scripts loaded with src=&quot;...&quot;), automatically replace calls to 'document.write()' with 'place.innerHTML+=' so script output is directed into tiddler content. Based on a suggestion by BradleyMeck
+''2005.11.08 [1.2.0]'' handle loading of javascript from an external URL via src=&quot;...&quot; syntax
+''2005.11.08 [1.1.0]'' pass 'place' param into scripts to provide direct DOM access 
+''2005.11.08 [1.0.0]'' initial release
+&lt;&lt;&lt;
+!!!!!Credits
+&lt;&lt;&lt;
+This feature was developed by EricShulman from [[ELS Design Studios|http:/www.elsdesign.com]]
+&lt;&lt;&lt;
+!!!!!Code
+***/
+//{{{
+version.extensions.inlineJavascript= {major: 1, minor: 5, revision: 1, date: new Date(2006,6,1)};
+
+config.formatters.push( {
+ name: &quot;inlineJavascript&quot;,
+ match: &quot;\\&lt;script&quot;,
+ lookahead: &quot;\\&lt;script(?: src=\\\&quot;((?:.|\\n)*?)\\\&quot;)?(?: label=\\\&quot;((?:.|\\n)*?)\\\&quot;)?( show)?\\&gt;((?:.|\\n)*?)\\&lt;/script\\&gt;&quot;,
+
+ handler: function(w) {
+ var lookaheadRegExp = new RegExp(this.lookahead,&quot;mg&quot;);
+ lookaheadRegExp.lastIndex = w.matchStart;
+ var lookaheadMatch = lookaheadRegExp.exec(w.source)
+ if(lookaheadMatch &amp;&amp; lookaheadMatch.index == w.matchStart) {
+ if (lookaheadMatch[1]) { // load a script library
+ // make script tag, set src, add to body to execute, then remove for cleanup
+ var script = document.createElement(&quot;script&quot;); script.src = lookaheadMatch[1];
+ document.body.appendChild(script); document.body.removeChild(script);
+ }
+ if (lookaheadMatch[4]) { // there is script code
+ if (lookaheadMatch[3]) // show inline script code in tiddler output
+ wikify(&quot;{{{\n&quot;+lookaheadMatch[0]+&quot;\n}}}\n&quot;,w.output);
+ if (lookaheadMatch[2]) { // create a link to an 'onclick' script
+ // add a link, define click handler, save code in link (pass 'place'), set link attributes
+ var link=createTiddlyElement(w.output,&quot;a&quot;,null,&quot;tiddlyLinkExisting&quot;,lookaheadMatch[2]);
+ link.onclick=function(){try{return(eval(this.code))}catch(e){alert(e.description?e.description:e.toString())}}
+ link.code=&quot;function _out(place){&quot;+lookaheadMatch[4]+&quot;};_out(this);&quot;
+ link.setAttribute(&quot;href&quot;,&quot;javascript:;&quot;); link.setAttribute(&quot;title&quot;,&quot;&quot;); link.style.cursor=&quot;pointer&quot;;
+ }
+ else { // run inline script code
+ var code=&quot;function _out(place){&quot;+lookaheadMatch[4]+&quot;};_out(w.output);&quot;
+ code=code.replace(/document.write\(/gi,'place.innerHTML+=(');
+ try { var out = eval(code); } catch(e) { out = e.description?e.description:e.toString(); }
+ if (out &amp;&amp; out.length) wikify(out,w.output,w.highlightRegExp,w.tiddler);
+ }
+ }
+ w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+ }
+ }
+} )
+//}}}</pre>
+</div>
+<div title="MainMenu" modifier="CehTeh" created="200803281310" changecount="1">
+<pre>''[[Lumiera|index.html]]''
+RoadMap
+ToDo
+[[Tasks]]
+[[Admin]]
+&lt;&lt;fullscreen&gt;&gt;</pre>
+</div>
+<div title="MarkupPreHead" modifier="CehTeh" created="200706191948">
+<pre>&lt;!--{{{--&gt;
+&lt;link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/&gt;
+&lt;!--}}}--&gt;
+
+&lt;style type=&quot;text/css&quot;&gt;#contentWrapper {display:none;}&lt;/style&gt;&lt;div id=&quot;SplashScreen&quot; style=&quot;border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;&quot;&gt;&lt;b&gt;My TiddlyWiki&lt;/b&gt; is loading&lt;blink&gt; ...&lt;/blink&gt;&lt;br&gt;&lt;br&gt;&lt;span style=&quot;font-size: 14px; color:red;&quot;&gt;Requires Javascript.&lt;/span&gt;&lt;/div&gt;</pre>
+</div>
+<div title="Overview" modifier="CehTeh" created="200803281319" changecount="1">
+<pre>Here we describe the things which are planned and going on.
+
+There is:
+ * A RoadMap which gives a coarse overview of the project.
+ * A ToDo list, showing whats left to be done on a intermediate to high level
+ * A list of detailed [[Tasks]] which are imminent to do.
+
+The goal of this wiki is not to track each and every task, but show whats going on and where possible contributors can pick a job.
+
+
+</pre>
+</div>
+<div title="PageTemplate" modifier="CehTeh" modified="200706110330" created="200701131624" tags="MPTWTheme" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706110330">
+<pre>&lt;!--{{{--&gt;
+&lt;div class='header' macro='gradient vert [[ColorPalette::PrimaryLight]] [[ColorPalette::PrimaryMid]]'&gt;
+	&lt;div class='headerShadow'&gt;
+		&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+		&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+	&lt;/div&gt;
+	&lt;div class='headerForeground'&gt;
+		&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;
+		&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;
+	&lt;/div&gt;
+&lt;/div&gt;
+&lt;!-- horizontal MainMenu --&gt;
+&lt;div id='topMenu' refresh='content' tiddler='MainMenu'&gt;&lt;/div&gt;
+&lt;!-- original MainMenu menu --&gt;
+&lt;!-- &lt;div id='mainMenu' refresh='content' tiddler='MainMenu'&gt;&lt;/div&gt; --&gt;
+&lt;div id='sidebar'&gt;
+	&lt;div id='sidebarOptions' refresh='content' tiddler='SideBarOptions'&gt;&lt;/div&gt;
+	&lt;div id='sidebarTabs' refresh='content' force='true' tiddler='SideBarTabs'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;div id='displayArea'&gt;
+	&lt;div id='messageArea'&gt;&lt;/div&gt;
+	&lt;div id='tiddlerDisplay'&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;!--}}}--&gt;
+</pre>
+</div>
+<div title="PartTiddlerPlugin" modifier="PauloSoares" modified="200611082325" created="200601251216" tags="excludeLists plugin systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200611082325">
+<pre>/***
+|&lt;html&gt;&lt;a name=&quot;Top&quot;/&gt;&lt;/html&gt;''Name:''|PartTiddlerPlugin|
+|''Version:''|1.0.6 (2006-11-07)|
+|''Source:''|http://tiddlywiki.abego-software.de/#PartTiddlerPlugin|
+|''Author:''|UdoBorkowski (ub [at] abego-software [dot] de)|
+|''Licence:''|[[BSD open source license]]|
+|''TiddlyWiki:''|2.0|
+|''Browser:''|Firefox 1.0.4+; InternetExplorer 6.0|
+!Table of Content&lt;html&gt;&lt;a name=&quot;TOC&quot;/&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Description',null, event)&quot;&gt;Description, Syntax&lt;/a&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Applications',null, event)&quot;&gt;Applications&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('LongTiddler',null, event)&quot;&gt;Refering to Paragraphs of a Longer Tiddler&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Citation',null, event)&quot;&gt;Citation Index&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('TableCells',null, event)&quot;&gt;Creating &quot;multi-line&quot; Table Cells&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Tabs',null, event)&quot;&gt;Creating Tabs&lt;/a&gt;&lt;/html&gt;
+** &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Sliders',null, event)&quot;&gt;Using Sliders&lt;/a&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Revisions',null, event)&quot;&gt;Revision History&lt;/a&gt;&lt;/html&gt;
+* &lt;html&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Code',null, event)&quot;&gt;Code&lt;/a&gt;&lt;/html&gt;
+!Description&lt;html&gt;&lt;a name=&quot;Description&quot;/&gt;&lt;/html&gt;
+With the {{{&lt;part aPartName&gt; ... &lt;/part&gt;}}} feature you can structure your tiddler text into separate (named) parts. 
+Each part can be referenced as a &quot;normal&quot; tiddler, using the &quot;//tiddlerName//''/''//partName//&quot; syntax (e.g. &quot;About/Features&quot;). E.g. you may create links to the parts, use it in {{{&lt;&lt;tiddler...&gt;&gt;}}} or {{{&lt;&lt;tabs...&gt;&gt;}}} macros etc.
+
+''Syntax:'' 
+|&gt;|''&lt;part'' //partName// [''hidden''] ''&gt;'' //any tiddler content// ''&lt;/part&gt;''|
+|//partName//|The name of the part. You may reference a part tiddler with the combined tiddler name &quot;//nameOfContainerTidder//''/''//partName//.|
+|''hidden''|When defined the content of the part is not displayed in the container tiddler. But when the part is explicitly referenced (e.g. in a {{{&lt;&lt;tiddler...&gt;&gt;}}} macro or in a link) the part's content is displayed.|
+|&lt;html&gt;&lt;i&gt;any&amp;nbsp;tiddler&amp;nbsp;content&lt;/i&gt;&lt;/html&gt;|&lt;html&gt;The content of the part.&lt;br&gt;A part can have any content that a &quot;normal&quot; tiddler may have, e.g. you may use all the formattings and macros defined.&lt;/html&gt;|
+|&gt;|~~Syntax formatting: Keywords in ''bold'', optional parts in [...]. 'or' means that exactly one of the two alternatives must exist.~~|
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Applications&lt;html&gt;&lt;a name=&quot;Applications&quot;/&gt;&lt;/html&gt;
+!!Refering to Paragraphs of a Longer Tiddler&lt;html&gt;&lt;a name=&quot;LongTiddler&quot;/&gt;&lt;/html&gt;
+Assume you have written a long description in a tiddler and now you want to refer to the content of a certain paragraph in that tiddler (e.g. some definition.) Just wrap the text with a ''part'' block, give it a nice name, create a &quot;pretty link&quot; (like {{{[[Discussion Groups|Introduction/DiscussionGroups]]}}}) and you are done.
+
+Notice this complements the approach to first writing a lot of small tiddlers and combine these tiddlers to one larger tiddler in a second step (e.g. using the {{{&lt;&lt;tiddler...&gt;&gt;}}} macro). Using the ''part'' feature you can first write a &quot;classic&quot; (longer) text that can be read &quot;from top to bottom&quot; and later &quot;reuse&quot; parts of this text for some more &quot;non-linear&quot; reading.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Citation Index&lt;html&gt;&lt;a name=&quot;Citation&quot;/&gt;&lt;/html&gt;
+Create a tiddler &quot;Citations&quot; that contains your &quot;citations&quot;. 
+Wrap every citation with a part and a proper name. 
+
+''Example''
+{{{
+&lt;part BAX98&gt;Baxter, Ira D. et al: //Clone Detection Using Abstract Syntax Trees.// 
+in //Proc. ICSM//, 1998.&lt;/part&gt;
+
+&lt;part BEL02&gt;Bellon, Stefan: //Vergleich von Techniken zur Erkennung duplizierten Quellcodes.// 
+Thesis, Uni Stuttgart, 2002.&lt;/part&gt;
+
+&lt;part DUC99&gt;Ducasse, Stéfane et al: //A Language Independent Approach for Detecting Duplicated Code.// 
+in //Proc. ICSM//, 1999.&lt;/part&gt;
+}}}
+
+You may now &quot;cite&quot; them just by using a pretty link like {{{[[Citations/BAX98]]}}} or even more pretty, like this {{{[[BAX98|Citations/BAX98]]}}}.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Creating &quot;multi-line&quot; Table Cells&lt;html&gt;&lt;a name=&quot;TableCells&quot;/&gt;&lt;/html&gt;
+You may have noticed that it is hard to create table cells with &quot;multi-line&quot; content. E.g. if you want to create a bullet list inside a table cell you cannot just write the bullet list
+{{{
+* Item 1
+* Item 2
+* Item 3
+}}}
+into a table cell (i.e. between the | ... | bars) because every bullet item must start in a new line but all cells of a table row must be in one line.
+
+Using the ''part'' feature this problem can be solved. Just create a hidden part that contains the cells content and use a {{{&lt;&lt;tiddler &gt;&gt;}}} macro to include its content in the table's cell.
+
+''Example''
+{{{
+|!Subject|!Items|
+|subject1|&lt;&lt;tiddler ./Cell1&gt;&gt;|
+|subject2|&lt;&lt;tiddler ./Cell2&gt;&gt;|
+
+&lt;part Cell1 hidden&gt;
+* Item 1
+* Item 2
+* Item 3
+&lt;/part&gt;
+...
+}}}
+
+Notice that inside the {{{&lt;&lt;tiddler ...&gt;&gt;}}} macro you may refer to the &quot;current tiddler&quot; using the &quot;.&quot;.
+
+BTW: The same approach can be used to create bullet lists with items that contain more than one line.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Creating Tabs&lt;html&gt;&lt;a name=&quot;Tabs&quot;/&gt;&lt;/html&gt;
+The build-in {{{&lt;&lt;tabs ...&gt;&gt;}}} macro requires that you defined an additional tiddler for every tab it displays. When you want to have &quot;nested&quot; tabs you need to define a tiddler for the &quot;main tab&quot; and one for every tab it contains. I.e. the definition of a set of tabs that is visually displayed at one place is distributed across multiple tiddlers.
+
+With the ''part'' feature you can put the complete definition in one tiddler, making it easier to keep an overview and maintain the tab sets.
+
+''Example''
+The standard tabs at the sidebar are defined by the following eight tiddlers:
+* SideBarTabs
+* TabAll
+* TabMore
+* TabMoreMissing
+* TabMoreOrphans
+* TabMoreShadowed
+* TabTags
+* TabTimeline
+
+Instead of these eight tiddlers one could define the following SideBarTabs tiddler that uses the ''part'' feature:
+{{{
+&lt;&lt;tabs txtMainTab 
+ Timeline Timeline SideBarTabs/Timeline 
+ All 'All tiddlers' SideBarTabs/All 
+ Tags 'All tags' SideBarTabs/Tags 
+ More 'More lists' SideBarTabs/More&gt;&gt;
+&lt;part Timeline hidden&gt;&lt;&lt;timeline&gt;&gt;&lt;/part&gt;
+&lt;part All hidden&gt;&lt;&lt;list all&gt;&gt;&lt;/part&gt;
+&lt;part Tags hidden&gt;&lt;&lt;allTags&gt;&gt;&lt;/part&gt;
+&lt;part More hidden&gt;&lt;&lt;tabs txtMoreTab 
+ Missing 'Missing tiddlers' SideBarTabs/Missing 
+ Orphans 'Orphaned tiddlers' SideBarTabs/Orphans 
+ Shadowed 'Shadowed tiddlers' SideBarTabs/Shadowed&gt;&gt;&lt;/part&gt;
+&lt;part Missing hidden&gt;&lt;&lt;list missing&gt;&gt;&lt;/part&gt;
+&lt;part Orphans hidden&gt;&lt;&lt;list orphans&gt;&gt;&lt;/part&gt;
+&lt;part Shadowed hidden&gt;&lt;&lt;list shadowed&gt;&gt;&lt;/part&gt;
+}}}
+
+Notice that you can easily &quot;overwrite&quot; individual parts in separate tiddlers that have the full name of the part.
+
+E.g. if you don't like the classic timeline tab but only want to see the 100 most recent tiddlers you could create a tiddler &quot;~SideBarTabs/Timeline&quot; with the following content:
+{{{
+&lt;&lt;forEachTiddler 
+ sortBy 'tiddler.modified' descending 
+ write '(index &lt; 100) ? &quot;* [[&quot;+tiddler.title+&quot;]]\n&quot;:&quot;&quot;'&gt;&gt;
+}}}
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!!Using Sliders&lt;html&gt;&lt;a name=&quot;Sliders&quot;/&gt;&lt;/html&gt;
+Very similar to the build-in {{{&lt;&lt;tabs ...&gt;&gt;}}} macro (see above) the {{{&lt;&lt;slider ...&gt;&gt;}}} macro requires that you defined an additional tiddler that holds the content &quot;to be slid&quot;. You can avoid creating this extra tiddler by using the ''part'' feature
+
+''Example''
+In a tiddler &quot;About&quot; we may use the slider to show some details that are documented in the tiddler's &quot;Details&quot; part.
+{{{
+...
+&lt;&lt;slider chkAboutDetails About/Details details &quot;Click here to see more details&quot;&gt;&gt;
+&lt;part Details hidden&gt;
+To give you a better overview ...
+&lt;/part&gt;
+...
+}}}
+
+Notice that putting the content of the slider into the slider's tiddler also has an extra benefit: When you decide you need to edit the content of the slider you can just doubleclick the content, the tiddler opens for editing and you can directly start editing the content (in the part section). In the &quot;old&quot; approach you would doubleclick the tiddler, see that the slider is using tiddler X, have to look for the tiddler X and can finally open it for editing. So using the ''part'' approach results in a much short workflow.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Revision history&lt;html&gt;&lt;a name=&quot;Revisions&quot;/&gt;&lt;/html&gt;
+* v1.0.6 (2006-11-07)
+** Bugfix: cannot edit tiddler when UploadPlugin by Bidix is installed. Thanks to José Luis González Castro for reporting the bug.
+* v1.0.5 (2006-03-02)
+** Bugfix: Example with multi-line table cells does not work in IE6. Thanks to Paulo Soares for reporting the bug.
+* v1.0.4 (2006-02-28)
+** Bugfix: Shadow tiddlers cannot be edited (in TW 2.0.6). Thanks to Torsten Vanek for reporting the bug.
+* v1.0.3 (2006-02-26)
+** Adapt code to newly introduced Tiddler.prototype.isReadOnly() function (in TW 2.0.6). Thanks to Paulo Soares for reporting the problem.
+* v1.0.2 (2006-02-05)
+** Also allow other macros than the &quot;tiddler&quot; macro use the &quot;.&quot; in the part reference (to refer to &quot;this&quot; tiddler)
+* v1.0.1 (2006-01-27)
+** Added Table of Content for plugin documentation. Thanks to RichCarrillo for suggesting.
+** Bugfix: newReminder plugin does not work when PartTiddler is installed. Thanks to PauloSoares for reporting.
+* v1.0.0 (2006-01-25)
+** initial version
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Code&lt;html&gt;&lt;a name=&quot;Code&quot;/&gt;&lt;/html&gt;
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;window.scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+***/
+//{{{
+//============================================================================
+// PartTiddlerPlugin
+
+// Ensure that the PartTiddler Plugin is only installed once.
+//
+if (!version.extensions.PartTiddlerPlugin) {
+
+
+
+version.extensions.PartTiddlerPlugin = {
+ major: 1, minor: 0, revision: 6,
+ date: new Date(2006, 10, 7), 
+ type: 'plugin',
+ source: &quot;http://tiddlywiki.abego-software.de/#PartTiddlerPlugin&quot;
+};
+
+if (!window.abego) window.abego = {};
+if (version.major &lt; 2) alertAndThrow(&quot;PartTiddlerPlugin requires TiddlyWiki 2.0 or newer.&quot;);
+
+//============================================================================
+// Common Helpers
+
+// Looks for the next newline, starting at the index-th char of text. 
+//
+// If there are only whitespaces between index and the newline 
+// the index behind the newline is returned, 
+// otherwise (or when no newline is found) index is returned.
+//
+var skipEmptyEndOfLine = function(text, index) {
+ var re = /(\n|[^\s])/g;
+ re.lastIndex = index;
+ var result = re.exec(text);
+ return (result &amp;&amp; text.charAt(result.index) == '\n') 
+ ? result.index+1
+ : index;
+}
+
+
+//============================================================================
+// Constants
+
+var partEndOrStartTagRE = /(&lt;\/part&gt;)|(&lt;part(?:\s+)((?:[^&gt;])+)&gt;)/mg;
+var partEndTagREString = &quot;&lt;\\/part&gt;&quot;;
+var partEndTagString = &quot;&lt;/part&gt;&quot;;
+
+//============================================================================
+// Plugin Specific Helpers
+
+// Parse the parameters inside a &lt;part ...&gt; tag and return the result.
+//
+// @return [may be null] {partName: ..., isHidden: ...}
+//
+var parseStartTagParams = function(paramText) {
+ var params = paramText.readMacroParams();
+ if (params.length == 0 || params[0].length == 0) return null;
+ 
+ var name = params[0];
+ var paramsIndex = 1;
+ var hidden = false;
+ if (paramsIndex &lt; params.length) {
+ hidden = params[paramsIndex] == &quot;hidden&quot;;
+ paramsIndex++;
+ }
+ 
+ return {
+ partName: name, 
+ isHidden: hidden
+ };
+}
+
+// Returns the match to the next (end or start) part tag in the text, 
+// starting the search at startIndex.
+// 
+// When no such tag is found null is returned, otherwise a &quot;Match&quot; is returned:
+// [0]: full match
+// [1]: matched &quot;end&quot; tag (or null when no end tag match)
+// [2]: matched &quot;start&quot; tag (or null when no start tag match)
+// [3]: content of start tag (or null if no start tag match)
+//
+var findNextPartEndOrStartTagMatch = function(text, startIndex) {
+ var re = new RegExp(partEndOrStartTagRE);
+ re.lastIndex = startIndex;
+ var match = re.exec(text);
+ return match;
+}
+
+//============================================================================
+// Formatter
+
+// Process the &lt;part ...&gt; ... &lt;/part&gt; starting at (w.source, w.matchStart) for formatting.
+//
+// @return true if a complete part section (including the end tag) could be processed, false otherwise.
+//
+var handlePartSection = function(w) {
+ var tagMatch = findNextPartEndOrStartTagMatch(w.source, w.matchStart);
+ if (!tagMatch) return false;
+ if (tagMatch.index != w.matchStart || !tagMatch[2]) return false;
+
+ // Parse the start tag parameters
+ var arguments = parseStartTagParams(tagMatch[3]);
+ if (!arguments) return false;
+ 
+ // Continue processing
+ var startTagEndIndex = skipEmptyEndOfLine(w.source, tagMatch.index + tagMatch[0].length);
+ var endMatch = findNextPartEndOrStartTagMatch(w.source, startTagEndIndex);
+ if (endMatch &amp;&amp; endMatch[1]) {
+ if (!arguments.isHidden) {
+ w.nextMatch = startTagEndIndex;
+ w.subWikify(w.output,partEndTagREString);
+ }
+ w.nextMatch = skipEmptyEndOfLine(w.source, endMatch.index + endMatch[0].length);
+ 
+ return true;
+ }
+ return false;
+}
+
+config.formatters.push( {
+ name: &quot;part&quot;,
+ match: &quot;&lt;part\\s+[^&gt;]+&gt;&quot;,
+ 
+ handler: function(w) {
+ if (!handlePartSection(w)) {
+ w.outputText(w.output,w.matchStart,w.matchStart+w.matchLength);
+ }
+ }
+} )
+
+//============================================================================
+// Extend &quot;fetchTiddler&quot; functionality to also recognize &quot;part&quot;s of tiddlers 
+// as tiddlers.
+
+var currentParent = null; // used for the &quot;.&quot; parent (e.g. in the &quot;tiddler&quot; macro)
+
+// Return the match to the first &lt;part ...&gt; tag of the text that has the
+// requrest partName.
+//
+// @return [may be null]
+//
+var findPartStartTagByName = function(text, partName) {
+ var i = 0;
+ 
+ while (true) {
+ var tagMatch = findNextPartEndOrStartTagMatch(text, i);
+ if (!tagMatch) return null;
+
+ if (tagMatch[2]) {
+ // Is start tag
+ 
+ // Check the name
+ var arguments = parseStartTagParams(tagMatch[3]);
+ if (arguments &amp;&amp; arguments.partName == partName) {
+ return tagMatch;
+ }
+ }
+ i += tagMatch[0].length;
+ }
+}
+
+// Return the part &quot;partName&quot; of the given parentTiddler as a &quot;readOnly&quot; Tiddler 
+// object, using fullName as the Tiddler's title. 
+//
+// All remaining properties of the new Tiddler (tags etc.) are inherited from 
+// the parentTiddler.
+// 
+// @return [may be null]
+//
+var getPart = function(parentTiddler, partName, fullName) {
+ var text = parentTiddler.text;
+ var startTag = findPartStartTagByName(text, partName);
+ if (!startTag) return null;
+ 
+ var endIndexOfStartTag = skipEmptyEndOfLine(text, startTag.index+startTag[0].length);
+ var indexOfEndTag = text.indexOf(partEndTagString, endIndexOfStartTag);
+
+ if (indexOfEndTag &gt;= 0) {
+ var partTiddlerText = text.substring(endIndexOfStartTag,indexOfEndTag);
+ var partTiddler = new Tiddler();
+ partTiddler.set(
+ fullName,
+ partTiddlerText,
+ parentTiddler.modifier,
+ parentTiddler.modified,
+ parentTiddler.tags,
+ parentTiddler.created);
+ partTiddler.abegoIsPartTiddler = true;
+ return partTiddler;
+ }
+ 
+ return null;
+}
+
+// Hijack the store.fetchTiddler to recognize the &quot;part&quot; addresses.
+//
+
+var oldFetchTiddler = store.fetchTiddler ;
+store.fetchTiddler = function(title) {
+ var result = oldFetchTiddler.apply(this, arguments);
+ if (!result &amp;&amp; title) {
+ var i = title.lastIndexOf('/');
+ if (i &gt; 0) {
+ var parentName = title.substring(0, i);
+ var partName = title.substring(i+1);
+ var parent = (parentName == &quot;.&quot;) 
+ ? currentParent 
+ : oldFetchTiddler.apply(this, [parentName]);
+ if (parent) {
+ return getPart(parent, partName, parent.title+&quot;/&quot;+partName);
+ }
+ }
+ }
+ return result; 
+};
+
+
+// The user must not edit a readOnly/partTiddler
+//
+
+config.commands.editTiddler.oldIsReadOnlyFunction = Tiddler.prototype.isReadOnly;
+
+Tiddler.prototype.isReadOnly = function() {
+ // Tiddler.isReadOnly was introduced with TW 2.0.6.
+ // For older version we explicitly check the global readOnly flag
+ if (config.commands.editTiddler.oldIsReadOnlyFunction) {
+ if (config.commands.editTiddler.oldIsReadOnlyFunction.apply(this, arguments)) return true;
+ } else {
+ if (readOnly) return true;
+ }
+
+ return this.abegoIsPartTiddler;
+}
+
+config.commands.editTiddler.handler = function(event,src,title)
+{
+ var t = store.getTiddler(title);
+ // Edit the tiddler if it either is not a tiddler (but a shadowTiddler)
+ // or the tiddler is not readOnly
+ if(!t || !t.abegoIsPartTiddler)
+ {
+ clearMessage();
+ story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE);
+ story.focusTiddler(title,&quot;text&quot;);
+ return false;
+ }
+}
+
+// To allow the &quot;./partName&quot; syntax in macros we need to hijack 
+// the invokeMacro to define the &quot;currentParent&quot; while it is running.
+// 
+var oldInvokeMacro = window.invokeMacro;
+function myInvokeMacro(place,macro,params,wikifier,tiddler) {
+ var oldCurrentParent = currentParent;
+ if (tiddler) currentParent = tiddler;
+ try {
+ oldInvokeMacro.apply(this, arguments);
+ } finally {
+ currentParent = oldCurrentParent;
+ }
+}
+window.invokeMacro = myInvokeMacro;
+
+// Scroll the anchor anchorName in the viewer of the given tiddler visible.
+// When no tiddler is defined use the tiddler of the target given event is used.
+window.scrollAnchorVisible = function(anchorName, tiddler, evt) {
+ var tiddlerElem = null;
+ if (tiddler) {
+ tiddlerElem = document.getElementById(story.idPrefix + tiddler);
+ }
+ if (!tiddlerElem &amp;&amp; evt) {
+ var target = resolveTarget(evt);
+ tiddlerElem = story.findContainingTiddler(target);
+ }
+ if (!tiddlerElem) return;
+
+ var children = tiddlerElem.getElementsByTagName(&quot;a&quot;);
+ for (var i = 0; i &lt; children.length; i++) {
+ var child = children[i];
+ var name = child.getAttribute(&quot;name&quot;);
+ if (name == anchorName) {
+ var y = findPosY(child);
+ window.scrollTo(0,y);
+ return;
+ }
+ }
+}
+
+} // of &quot;install only once&quot;
+//}}}
+
+/***
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+
+!Licence and Copyright
+Copyright (c) abego Software ~GmbH, 2006 ([[www.abego-software.de|http://www.abego-software.de]])
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+Neither the name of abego Software nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+&lt;html&gt;&lt;sub&gt;&lt;a href=&quot;javascript:;&quot; onclick=&quot;scrollAnchorVisible('Top',null, event)&quot;&gt;[Top]&lt;/sub&gt;&lt;/a&gt;&lt;/html&gt;
+***/</pre>
+</div>
+<div title="RSSReaderPlugin" modifier="BidiX" modified="200704220833" created="200704132044" tags="systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200704220833">
+<pre>/***
+|''Name:''|RSSReaderPlugin|
+|''Description:''|This plugin provides a RSSReader for TiddlyWiki|
+|''Version:''|1.1.1|
+|''Date:''|Apr 21, 2007|
+|''Source:''|http://tiddlywiki.bidix.info/#RSSReaderPlugin|
+|''Documentation:''|http://tiddlywiki.bidix.info/#RSSReaderPluginDoc|
+|''Author:''|BidiX (BidiX (at) bidix (dot) info)|
+|''Credit:''|BramChen for RssNewsMacro|
+|''License:''|[[BSD open source license|http://tiddlywiki.bidix.info/#%5B%5BBSD%20open%20source%20license%5D%5D ]]|
+|''~CoreVersion:''|2.2.0|
+|''OptionalRequires:''|http://www.tiddlytools.com/#NestedSlidersPlugin|
+***/
+//{{{
+version.extensions.RSSReaderPlugin = {
+	major: 1, minor: 1, revision: 1,
+	date: new Date(&quot;Apr 21, 2007&quot;),
+	source: &quot;http://TiddlyWiki.bidix.info/#RSSReaderPlugin&quot;,
+	author: &quot;BidiX&quot;,
+	coreVersion: '2.2.0'
+};
+
+config.macros.rssReader = {
+	dateFormat: &quot;DDD, DD MMM YYYY&quot;,
+	itemStyle: &quot;display: block;border: 1px solid black;padding: 5px;margin: 5px;&quot;, //useed  '@@'+itemStyle+itemText+'@@'
+	msg:{
+		permissionDenied: &quot;Permission to read preferences was denied.&quot;,
+		noRSSFeed: &quot;No RSS Feed at this address %0&quot;,
+		urlNotAccessible: &quot; Access to %0 is not allowed&quot;
+	},
+	cache: [], 	// url =&gt; XMLHttpRequest.responseXML
+	desc: &quot;noDesc&quot;,
+	
+	handler: function(place,macroName,params,wikifier,paramString,tiddler) {
+		var desc = params[0];
+		var feedURL = params[1];
+		var toFilter = (params[2] ? true : false);
+		var filterString = (toFilter?(params[2].substr(0,1) == ' '? tiddler.title:params[2]):'');
+		var place = createTiddlyElement(place, &quot;div&quot;, &quot;RSSReader&quot;);
+		wikify(&quot;^^&lt;&lt;rssFeedUpdate &quot;+feedURL+&quot; [[&quot; + tiddler.title + &quot;]]&gt;&gt;^^\n&quot;,place);
+		if (this.cache[feedURL]) {
+			this.displayRssFeed(this.cache[feedURL], feedURL, place, desc, toFilter, filterString);
+		}
+		else {
+			var r = loadRemoteFile(feedURL,config.macros.rssReader.processResponse, [place, desc, toFilter, filterString]);
+			if (typeof r == &quot;string&quot;)
+				displayMessage(r);
+		}
+		
+	},
+
+	// callback for loadRemoteFile 
+	// params : [place, desc, toFilter, filterString]
+	processResponse: function(status, params, responseText, url, xhr) { // feedURL, place, desc, toFilter, filterString) {	
+		if (window.netscape){
+			try {
+				if (document.location.protocol.indexOf(&quot;http&quot;) == -1) {
+					netscape.security.PrivilegeManager.enablePrivilege(&quot;UniversalBrowserRead&quot;);
+				}
+			}
+			catch (e) { displayMessage(e.description?e.description:e.toString()); }
+		}
+		if (xhr.status == httpStatus.NotFound)
+		 {
+			displayMessage(config.macros.rssReader.noRSSFeed.format([url]));
+			return;
+		}
+		if (!status)
+		 {
+			displayMessage(config.macros.rssReader.noRSSFeed.format([url]));
+			return;
+		}
+		if (xhr.responseXML) {
+			// response is interpreted as XML
+			config.macros.rssReader.cache[url] = xhr.responseXML;
+			config.macros.rssReader.displayRssFeed(xhr.responseXML, params[0], url, params[1], params[2], params[3]);
+		}
+		else {
+			if (responseText.substr(0,5) == &quot;&lt;?xml&quot;) {
+				// response exists but not return as XML -&gt; try to parse it 
+				var dom = (new DOMParser()).parseFromString(responseText, &quot;text/xml&quot;); 
+				if (dom) {
+					// parsing successful so use it
+					config.macros.rssReader.cache[url] = dom;
+					config.macros.rssReader.displayRssFeed(dom, params[0], url, params[1], params[2], params[3]);
+					return;
+				}
+			}
+			// no XML display as html 
+			wikify(&quot;&lt;html&gt;&quot; + responseText + &quot;&lt;/html&gt;&quot;, params[0]);
+			displayMessage(config.macros.rssReader.msg.noRSSFeed.format([url]));
+		}
+	},
+
+	// explore down the DOM tree
+	displayRssFeed: function(xml, place, feedURL, desc, toFilter, filterString){
+		// Channel
+		var chanelNode = xml.getElementsByTagName('channel').item(0);
+		var chanelTitleElement = (chanelNode ? chanelNode.getElementsByTagName('title').item(0) : null);
+		var chanelTitle = &quot;&quot;;
+		if ((chanelTitleElement) &amp;&amp; (chanelTitleElement.firstChild)) 
+			chanelTitle = chanelTitleElement.firstChild.nodeValue;
+		var chanelLinkElement = (chanelNode ? chanelNode.getElementsByTagName('link').item(0) : null);
+		var chanelLink = &quot;&quot;;
+		if (chanelLinkElement) 
+			chanelLink = chanelLinkElement.firstChild.nodeValue;
+		var titleTxt = &quot;!![[&quot;+chanelTitle+&quot;|&quot;+chanelLink+&quot;]]\n&quot;;
+		var title = createTiddlyElement(place,&quot;div&quot;,null,&quot;ChanelTitle&quot;,null);
+		wikify(titleTxt,title);
+		// ItemList
+		var itemList = xml.getElementsByTagName('item');
+		var article = createTiddlyElement(place,&quot;ul&quot;,null,null,null);
+		var lastDate;
+		var re;
+		if (toFilter) 
+			re = new RegExp(filterString.escapeRegExp());
+		for (var i=0; i&lt;itemList.length; i++){
+			var titleElm = itemList[i].getElementsByTagName('title').item(0);
+			var titleText = (titleElm ? titleElm.firstChild.nodeValue : '');
+			if (toFilter &amp;&amp; ! titleText.match(re)) {
+				continue;
+			}
+			var descText = '';
+			descElem = itemList[i].getElementsByTagName('description').item(0);
+			if (descElem){
+				try{
+					for (var ii=0; ii&lt;descElem.childNodes.length; ii++) {
+						descText += descElem.childNodes[ii].nodeValue;
+					}
+				}
+				catch(e){}
+				descText = descText.replace(/&lt;br \/&gt;/g,'\n');
+				if (desc == &quot;asHtml&quot;)
+					descText = &quot;&lt;html&gt;&quot;+descText+&quot;&lt;/html&gt;&quot;;
+			}
+			var linkElm = itemList[i].getElementsByTagName(&quot;link&quot;).item(0);
+			var linkURL = linkElm.firstChild.nodeValue;
+			var pubElm = itemList[i].getElementsByTagName('pubDate').item(0);
+			var pubDate;
+			if (!pubElm) {
+				pubElm = itemList[i].getElementsByTagName('date').item(0); // for del.icio.us
+				if (pubElm) {
+					pubDate = pubElm.firstChild.nodeValue;
+					pubDate = this.formatDateString(this.dateFormat, pubDate);
+					}
+					else {
+						pubDate = '0';
+					}
+				}
+			else {
+				pubDate = (pubElm ? pubElm.firstChild.nodeValue : 0);
+				pubDate = this.formatDate(this.dateFormat, pubDate);
+			}
+			titleText = titleText.replace(/\[|\]/g,'');
+			var rssText = '*'+'[[' + titleText + '|' + linkURL + ']]' + '' ;
+			if ((desc != &quot;noDesc&quot;) &amp;&amp; descText){
+				rssText = rssText.replace(/\n/g,' ');
+				descText = '@@'+this.itemStyle+descText + '@@\n';				
+				if (version.extensions.nestedSliders){
+					descText = '+++[...]' + descText + '===';
+				}
+				rssText = rssText + descText;
+			}
+			var story;
+			if ((lastDate != pubDate) &amp;&amp; ( pubDate != '0')) {
+				story = createTiddlyElement(article,&quot;li&quot;,null,&quot;RSSItem&quot;,pubDate);
+				lastDate = pubDate;
+			}
+			else {
+				lastDate = pubDate;
+			}
+			story = createTiddlyElement(article,&quot;div&quot;,null,&quot;RSSItem&quot;,null);
+			wikify(rssText,story);
+		}
+	},
+	
+	formatDate: function(template, date){
+		var dateString = new Date(date);
+		// template = template.replace(/hh|mm|ss/g,'');
+		return dateString.formatString(template);
+	},
+	
+	formatDateString: function(template, date){
+		var dateString = new Date(date.substr(0,4), date.substr(5,2) - 1, date.substr(8,2)
+			);
+		return dateString.formatString(template);
+	}
+	
+};
+
+config.macros.rssFeedUpdate = {
+	label: &quot;Update&quot;,
+	prompt: &quot;Clear the cache and redisplay this RssFeed&quot;,
+	handler: function(place,macroName,params) {
+		var feedURL = params[0];
+		var tiddlerTitle = params[1];
+		createTiddlyButton(place, this.label, this.prompt, 
+			function () {
+				if (config.macros.rssReader.cache[feedURL]) {
+					config.macros.rssReader.cache[feedURL] = null; 
+			}
+			story.refreshTiddler(tiddlerTitle,null, true);
+		return false;});
+	}
+};
+
+//}}}
+</pre>
+</div>
+<div title="RSSReaderPluginDoc" modifier="BidiX" modified="200704220857" created="200704132051" tags="Doc RSSReader" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200704220857">
+<pre>//last update: RSSReaderPlugin v 1.1.1//
+
+!Description
+This plugin provides a RSSReader for TiddlyWiki
+* It accesses asynchronously an RSSFeed
+*Depending on the chanel item format, each item could be written as :
+**simple text wikified
+**html
+
+!Usage
+{{{
+&lt;&lt;rssReader noDesc|asHtml|asText rssUrl ['filtering string']&gt;&gt;
+	noDesc: only title of item is printed
+
+	asHtml: if you know that description contain html (links, img ...), 
+		the text is enclosed with &lt;html&gt; &lt;/html&gt; tags
+
+ 	asText: if the description should not be interpreted as html the 
+		description is wikified
+
+	rssUrl: the rssFeed url that could be accessed. 
+	
+	'filtering string': if present, the rssfeed item title must contained 
+		this string to be displayed. 
+		If 'filering string' contained space characters only, the tiddler 
+		title is used for filtering.
+
+}}}
+
+For security reasons, if the TiddlyWiki is accessed from http, a ProxyService should be used to access an rssFeed from an other site.
+
+!examples
+| !reader | !RSSFeed type | !working from |
+| BidiXTWRSS | Description asHtml | file: or tiddlywiki.bidix.info |
+| [[Le Monde]] | Description asText | file: or tiddlywiki.bidix.info using proxy |
+| YahooNewsSport | Description asHtml | file: or tiddlywiki.bidix.info using proxy |
+| TiddlyWikiRSS | Description asHtml | file: or tiddlywiki.bidix.info using proxy |
+| [[Libération]] | noDesc | file: or tiddlywiki.bidix.info using proxy |
+| [[TestComment]] | asText and filters | file: or tiddlywiki.bidix.info using proxy |
+see : &lt;&lt;tag RSSFeed&gt;&gt; for the full list.
+
+!Revision history
+* V1.1.0 (2207/04/13)
+**No more import functions
+* V1.0.0 (2006/11/11)
+**refactoring using core loadRemoteFile function
+**import using new tiddlywiki:tiddler element
+**import and presentation preserved without EricShulman's NestedSliderPlugin
+**better display of items 
+* v0.3.0 (24/08/2006)
+** Filter on RSS item title
+** Place to display redefined for asynchronous processing
+* v0.2.2 (22/08/2006)
+**Haloscan feed has no pubDate.
+* v0.2.1 (08/05/2006)
+* v0.2.0 (01/05/2006)
+**Small adapations for del.icio.us feed
+* v0.1.1 (28/04/2006)
+**Bug : Channel without title 
+* v0.1.0 (24/04/2006)
+** initial release
+
+
+</pre>
+</div>
+<div title="RoadMap" modifier="CehTeh" modified="200804090217" created="200804011655" changecount="7">
+<pre>! Foundations, not really a milestone yet
+
+We need following in a basically working / mockup state:
+
+* Proc layer, basic rendering, partly mockups
+* Backend
+** File backend, caching
+** Serializer
+** Scheduler
+* Support Libary
+** Plugin Loader
+** Other tools there
+* Infrastructure
+** Testsuite
+** Website
+
+!! Next Goals
+
+# Make a [[video player mockup]]</pre>
+</div>
+<div title="SiteSubtitle" modifier="CehTeh" created="200803281323" changecount="1">
+<pre>Roadmap and tasks</pre>
+</div>
+<div title="SiteTitle" modifier="CehTeh" created="200803281323" changecount="2">
+<pre>ToDo</pre>
+</div>
+<div title="SplashScreenPlugin" modifier="Saq" modified="200607202048" created="200607191631" tags="lewcidExtension systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200607202048">
+<pre>/***
+
+''Inspired by [[TiddlyPom|http://www.warwick.ac.uk/~tuspam/tiddlypom.html]]''
+
+|Name|SplashScreenPlugin|
+|Created by|SaqImtiaz|
+|Location|http://tw.lewcid.org/#SplashScreenPlugin|
+|Version|0.21 |
+|Requires|~TW2.08+|
+!Description:
+Provides a simple splash screen that is visible while the TW is loading.
+
+!Installation
+Copy the source text of this tiddler to your TW in a new tiddler, tag it with systemConfig and save and reload. The SplashScreen will now be installed and will be visible the next time you reload your TW.
+
+!Customizing
+Once the SplashScreen has been installed and you have reloaded your TW, the splash screen html will be present in the MarkupPreHead tiddler. You can edit it and customize to your needs.
+
+!History
+* 20-07-06 : version 0.21, modified to hide contentWrapper while SplashScreen is displayed.
+* 26-06-06 : version 0.2, first release
+
+!Code
+***/
+//{{{
+var old_lewcid_splash_restart=restart;
+
+restart = function()
+{   if (document.getElementById(&quot;SplashScreen&quot;))
+        document.getElementById(&quot;SplashScreen&quot;).style.display = &quot;none&quot;;
+      if (document.getElementById(&quot;contentWrapper&quot;))
+        document.getElementById(&quot;contentWrapper&quot;).style.display = &quot;block&quot;;
+    
+    old_lewcid_splash_restart();
+   
+    if (splashScreenInstall)
+       {if(config.options.chkAutoSave)
+			{saveChanges();}
+        displayMessage(&quot;TW SplashScreen has been installed, please save and refresh your TW.&quot;);
+        }
+}
+
+
+var oldText = store.getTiddlerText(&quot;MarkupPreHead&quot;);
+if (oldText.indexOf(&quot;SplashScreen&quot;)==-1)
+   {var siteTitle = store.getTiddlerText(&quot;SiteTitle&quot;);
+   var splasher='\n\n&lt;style type=&quot;text/css&quot;&gt;#contentWrapper {display:none;}&lt;/style&gt;&lt;div id=&quot;SplashScreen&quot; style=&quot;border: 3px solid #ccc; display: block; text-align: center; width: 320px; margin: 100px auto; padding: 50px; color:#000; font-size: 28px; font-family:Tahoma; background-color:#eee;&quot;&gt;&lt;b&gt;'+siteTitle +'&lt;/b&gt; is loading&lt;blink&gt; ...&lt;/blink&gt;&lt;br&gt;&lt;br&gt;&lt;span style=&quot;font-size: 14px; color:red;&quot;&gt;Requires Javascript.&lt;/span&gt;&lt;/div&gt;';
+   if (! store.tiddlerExists(&quot;MarkupPreHead&quot;))
+       {var myTiddler = store.createTiddler(&quot;MarkupPreHead&quot;);}
+   else
+      {var myTiddler = store.getTiddler(&quot;MarkupPreHead&quot;);}
+      myTiddler.set(myTiddler.title,oldText+splasher,config.options.txtUserName,null,null);
+      store.setDirty(true);
+      var splashScreenInstall = true;
+}
+//}}}</pre>
+</div>
+<div title="StyleSheet" modifier="CehTeh" modified="200706090017" created="200701131624" tags="MPTWTheme" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200706090017">
+<pre>/*{{{*/
+/* a contrasting background so I can see where one tiddler ends and the other begins */
+body {
+	background: [[ColorPalette::TertiaryLight]];
+}
+
+/* sexy colours and font for the header */
+.headerForeground {
+	color: [[ColorPalette::PrimaryPale]];
+}
+.headerShadow, .headerShadow a {
+	color: [[ColorPalette::PrimaryMid]];
+}
+.headerForeground, .headerShadow {
+	padding: 1em 1em 0;
+	font-family: 'Trebuchet MS' sans-serif;
+	font-weight:bold;
+}
+.headerForeground .siteSubtitle {
+	color: [[ColorPalette::PrimaryLight]];
+}
+.headerShadow .siteSubtitle {
+	color: [[ColorPalette::PrimaryMid]];
+}
+
+/* make shadow go and down right instead of up and left */
+.headerShadow {
+	left: 2px;
+	top: 3px;
+}
+
+/* prefer monospace for editing */
+.editor textarea {
+	font-family: 'Consolas' monospace;
+}
+
+/* sexy tiddler titles */
+.title {
+	font-size: 250%;
+	color: [[ColorPalette::PrimaryLight]];
+	font-family: 'Trebuchet MS' sans-serif;
+}
+
+/* more subtle tiddler subtitle */
+.subtitle {
+	padding:0px;
+	margin:0px;
+	padding-left:0.5em;
+	font-size: 90%;
+	color: [[ColorPalette::TertiaryMid]];
+}
+.subtitle .tiddlyLink {
+	color: [[ColorPalette::TertiaryMid]];
+}
+
+/* a little bit of extra whitespace */
+.viewer {
+	padding-bottom:3px;
+}
+
+/* don't want any background color for headings */
+h1,h2,h3,h4,h5,h6 {
+	background: [[ColorPalette::Background]];
+	color: [[ColorPalette::Foreground]];
+}
+
+/* give tiddlers 3d style border and explicit background */
+.tiddler {
+	background: [[ColorPalette::Background]];
+	border-right: 2px [[ColorPalette::TertiaryMid]] solid;
+	border-bottom: 2px [[ColorPalette::TertiaryMid]] solid;
+	margin-bottom: 1em;
+	padding-bottom: 2em;
+}
+
+/* make options slider look nicer */
+#sidebarOptions .sliderPanel {
+	border:solid 1px [[ColorPalette::PrimaryLight]];
+}
+
+
+/* the borders look wrong with the body background */
+#sidebar .button {
+	border-style: none;
+}
+
+/* displays the list of a tiddler's tags horizontally. used in ViewTemplate */
+.tagglyTagged li.listTitle {
+	display:none
+}
+.tagglyTagged li {
+	display: inline; font-size:90%;
+}
+.tagglyTagged ul {
+	margin:0px; padding:0px;
+}
+
+/* this means you can put line breaks in SidebarOptions for readability */
+#sidebarOptions br {
+	display:none;
+}
+/* undo the above in OptionsPanel */
+#sidebarOptions .sliderPanel br {
+	display:inline;
+}
+
+/* horizontal main menu stuff */
+#displayArea {
+	margin: 1em 15.7em 0em 1em; /* use the freed up space */
+}
+#topMenu br {
+	display: none;
+}
+#topMenu {
+	background: [[ColorPalette::PrimaryMid]];
+	color:[[ColorPalette::PrimaryPale]];
+}
+#topMenu {
+	padding:2px;
+}
+#topMenu .button, #topMenu .tiddlyLink, #topMenu a {
+	margin-left: 0.5em;
+	margin-right: 0.5em;
+	padding-left: 3px;
+	padding-right: 3px;
+	color: [[ColorPalette::PrimaryPale]];
+	font-size: 115%;
+}
+#topMenu .button:hover, #topMenu .tiddlyLink:hover {
+	background: [[ColorPalette::PrimaryDark]];
+}
+
+/* make it print a little cleaner */
+@media print {
+	#topMenu {
+		display: none ! important;
+	}
+	/* not sure if we need all the importants */
+	.tiddler {
+		border-style: none ! important;
+		margin:0px ! important;
+		padding:0px ! important;
+		padding-bottom:2em ! important;
+	}
+	.tagglyTagging .button, .tagglyTagging .hidebutton {
+		display: none ! important;
+	}
+	.headerShadow {
+		visibility: hidden ! important;
+	}
+	.tagglyTagged .quickopentag, .tagged .quickopentag {
+		border-style: none ! important;
+	}
+	.quickopentag a.button, .miniTag {
+		display: none ! important;
+	}
+}
+/*}}}*/
+</pre>
+</div>
+<div title="TabTimeline" modifier="CehTeh" created="200706191949" changecount="1">
+<pre>&lt;&lt;timeline better:true maxDays:14 maxEntries:20&gt;&gt;</pre>
+</div>
+<div title="TaskMacroPlugin" modifier="LukeBlanshard" modified="200605131931" created="200510261917" tags="systemConfig TaskMacro" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605131931">
+<pre>/***
+|Name|TaskMacroPlugin|
+|Author|&lt;&lt;extension TaskMacroPlugin author&gt;&gt;|
+|Location|&lt;&lt;extension TaskMacroPlugin source&gt;&gt;|
+|License|&lt;&lt;extension TaskMacroPlugin license&gt;&gt;|
+|Version|&lt;&lt;extension TaskMacroPlugin versionAndDate&gt;&gt;|
+!Description
+A set of macros to help you keep track of time estimates for tasks.
+
+Macros defined:
+* {{{task}}}: Displays a task description and makes it easy to estimate and track the time spent on the task.
+* {{{taskadder}}}: Displays text entry field to simplify the adding of tasks.
+* {{{tasksum}}}: Displays a summary of tasks sandwiched between two calls to this macro.
+* {{{extension}}}: A simple little macro that displays information about a TiddlyWiki plugin, and that will hopefully someday migrate to the TW core in some form.
+Core overrides:
+* {{{wikify}}}: when wikifying a tiddler's complete text, adds refresh information so the tiddler will be refreshed when it changes
+* {{{config.refreshers}}}: have the built-in refreshers return true; also, add a new refresher (&quot;fullContent&quot;) that redisplays a full tiddler whenever it or any nested tiddlers it shows are changed
+* {{{refreshElements}}}: now checks the return value from the refresher and only short-circuits the recursion if the refresher returns true
+!Plugin Information
+***/
+//{{{
+version.extensions.TaskMacroPlugin = {
+	major: 1, minor: 1, revision: 0,
+	date: new Date(2006,5-1,13),
+	author: &quot;LukeBlanshard&quot;,
+	source: &quot;http://labwiki.sourceforge.net/#TaskMacroPlugin&quot;,
+	license: &quot;http://labwiki.sourceforge.net/#CopyrightAndLicense&quot;
+}
+//}}}
+/***
+A little macro for pulling out extension info.  Use like {{{&lt;&lt;extension PluginName datum&gt;&gt;}}}, where {{{PluginName}}} is the name you used for {{{version.extensions}}} and {{{datum}}} is either {{{versionAndDate}}} or a property of the extension description object, such as {{{source}}}.
+***/
+//{{{
+config.macros.extension = {
+	handler: function( place, macroName, params, wikifier, paramString, tiddler ) {
+		var info  = version.extensions[params[0]]
+		var datum = params[1]
+		switch (params[1]) {
+		case 'versionAndDate':
+			createTiddlyElement( place, &quot;span&quot;, null, null,
+				info.major+'.'+info.minor+'.'+info.revision+', '+info.date.formatString('DD MMM YYYY') )
+			break;
+		default:
+			wikify( info[datum], place )
+			break;
+		}
+	}
+}
+//}}}
+/***
+!Core Overrides
+***/
+//{{{
+window.wikify_orig_TaskMacroPlugin = window.wikify
+window.wikify = function(source,output,highlightRegExp,tiddler)
+{
+	if ( tiddler &amp;&amp; tiddler.text === source )
+		addDisplayDependency( output, tiddler.title )
+	wikify_orig_TaskMacroPlugin.apply( this, arguments )
+}
+config.refreshers_orig_TaskMacroPlugin = config.refreshers
+config.refreshers = {
+	link: function() {
+		config.refreshers_orig_TaskMacroPlugin.link.apply( this, arguments )
+		return true
+	},
+	content: function() {
+		config.refreshers_orig_TaskMacroPlugin.content.apply( this, arguments )
+		return true
+	},
+	fullContent: function( e, changeList ) {
+		var tiddlers = e.refreshTiddlers
+		if ( changeList == null || tiddlers == null )
+			return false
+		for ( var i=0; i &lt; tiddlers.length; ++i )
+			if ( changeList.find(tiddlers[i]) != null ) {
+				var title = tiddlers[0]
+				story.refreshTiddler( title, null, true )
+				return true
+			}
+		return false
+	}
+}
+function refreshElements(root,changeList)
+{
+	var nodes = root.childNodes;
+	for(var c=0; c&lt;nodes.length; c++)
+		{
+		var e = nodes[c],type;
+		if(e.getAttribute)
+			type = e.getAttribute(&quot;refresh&quot;);
+		else
+			type = null;
+		var refresher = config.refreshers[type];
+		if ( ! refresher || ! refresher(e, changeList) )
+			{
+			if(e.hasChildNodes())
+				refreshElements(e,changeList);
+			}
+		}
+}
+//}}}
+/***
+!Global Functions
+***/
+//{{{
+// Add the tiddler whose title is given to the list of tiddlers whose
+// changing will cause a refresh of the tiddler containing the given element.
+function addDisplayDependency( element, title ) {
+	while ( element &amp;&amp; element.getAttribute ) {
+		var idAttr = element.getAttribute(&quot;id&quot;), tiddlerAttr = element.getAttribute(&quot;tiddler&quot;)
+		if ( idAttr &amp;&amp; tiddlerAttr &amp;&amp; idAttr == story.idPrefix+tiddlerAttr ) {
+			var list = element.refreshTiddlers
+			if ( list == null ) {
+				list = [tiddlerAttr]
+				element.refreshTiddlers = list
+				element.setAttribute( &quot;refresh&quot;, &quot;fullContent&quot; )
+			}
+			list.pushUnique( title )
+			return
+		}
+		element = element.parentNode
+	}
+}
+
+// Lifted from Story.prototype.focusTiddler: just return the field instead of focusing it.
+Story.prototype.findEditField = function( title, field )
+{
+	var tiddler = document.getElementById(this.idPrefix + title);
+	if(tiddler != null)
+		{
+		var children = tiddler.getElementsByTagName(&quot;*&quot;)
+		var e = null;
+		for (var t=0; t&lt;children.length; t++)
+			{
+			var c = children[t];
+			if(c.tagName.toLowerCase() == &quot;input&quot; || c.tagName.toLowerCase() == &quot;textarea&quot;)
+				{
+				if(!e)
+					e = c;
+				if(c.getAttribute(&quot;edit&quot;) == field)
+					e = c;
+				}
+			}
+		return e
+		}
+}
+
+// Wraps the given event function in another function that handles the
+// event in a standard way.
+function wrapEventHandler( otherHandler ) {
+	return function(e) {
+		if (!e) var e = window.event
+		e.cancelBubble = true
+		if (e.stopPropagation) e.stopPropagation()
+		return otherHandler( e )
+	}
+}
+//}}}
+/***
+!Task Macro
+Usage:
+&gt; {{{&lt;&lt;task orig cur spent&gt;&gt;description}}}
+All of orig, cur, and spent are optional numbers of hours.  The description goes through the end of the line, and is wikified.
+***/
+//{{{
+config.macros.task = {
+	NASCENT:	0, // Task not yet estimated
+	LIVE:		1, // Estimated but with time remaining
+	DONE:		2, // Completed: no time remaining
+	bullets:	[&quot;\u25cb&quot;, // nascent (open circle)
+			 &quot;\u25ba&quot;, // live (right arrow)
+			 &quot;\u25a0&quot;],// done (black square)
+	styles:		[&quot;nascent&quot;, &quot;live&quot;, &quot;done&quot;],
+
+	// Translatable text:
+	lingo: {
+		spentTooBig:	&quot;Spent time %0 can't exceed current estimate %1&quot;,
+		noNegative:	&quot;Times may not be negative numbers&quot;,
+		statusTips:	[&quot;Not yet estimated&quot;, &quot;To do&quot;, &quot;Done&quot;], // Array indexed by state (NASCENT/LIVE/DONE)
+		descClickTip:	&quot; -- Double-click to edit task description&quot;,
+		statusClickTip:	&quot; -- Double-click to mark task complete&quot;,
+		statusDoneTip:	&quot; -- Double-click to adjust the time spent, to revive the task&quot;,
+		origTip:	&quot;Original estimate in hours&quot;,
+		curTip:		&quot;Current estimate in hours&quot;,
+		curTip2:	&quot;Estimate in hours&quot;, // For when orig == cur
+		clickTip:	&quot; -- Click to adjust&quot;,
+		spentTip:	&quot;Hours spent on this task&quot;,
+		remTip:		&quot;Hours remaining&quot;,
+		curPrompt:	&quot;Estimate this task in hours, or adjust the current estimate by starting with + or -.\n\nYou may optionally also set or adjust the time spent by putting a second number after the first.&quot;,
+		spentPrompt:	&quot;Enter the number of hours you've spent on this task, or adjust the current number by starting with + or -.\n\nYou may optionally also set or adjust the time remaining by putting a second number after the first.&quot;,
+		remPrompt:	&quot;Enter the number of hours it will take to finish this task, or adjust the current estimate by starting with + or -.\n\nYou may optionally also set or adjust the time spent by putting a second number after the first.&quot;,
+		numbersOnly:	&quot;Enter numbers only, please&quot;,
+		notCurrent:	&quot;The tiddler has been modified since it was displayed, please redisplay it before doing this.&quot;
+	},
+
+	// The macro handler
+	handler: function( place, macroName, params, wikifier, paramString, tiddler )
+	{
+		var start = wikifier.matchStart, end = wikifier.nextMatch
+
+		var origStr	= params.length &gt; 0? params.shift() : &quot;?&quot;
+		var orig	= +origStr // as a number
+		var cur		= params.length &gt; 1? +params.shift() : orig
+		var spent	= params.length &gt; 0? +params.shift() : 0
+		if ( spent &gt; cur )
+			throw Error( this.lingo.spentTooBig.format([spent, cur]) )
+		if ( orig &lt; 0 || cur &lt; 0 || spent &lt; 0 )
+			throw Error( this.lingo.noNegative )
+		var rem		= cur - spent
+		var state	= isNaN(orig+rem)? this.NASCENT : rem &gt; 0? this.LIVE : this.DONE
+		var table	= createTiddlyElement( place, &quot;table&quot;, null, &quot;task &quot;+this.styles[state] )
+		var tbody	= createTiddlyElement( table, &quot;tbody&quot; )
+		var row		= createTiddlyElement( tbody, &quot;tr&quot; )
+		var statusCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;status&quot;, this.bullets[state] )
+		var descCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;description&quot; )
+
+		var origCell	= state==this.NASCENT || orig==cur? null
+				: createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric original&quot; )
+		var curCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric current&quot; )
+		var spentCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric spent&quot; )
+		var remCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric remaining&quot; )
+
+		var sums = config.macros.tasksum.tasksums
+		if ( sums &amp;&amp; sums.length ) {
+			var summary = [(state == this.NASCENT? NaN : orig), cur, spent]
+			summary.owner = tiddler
+			sums[0].push( summary )
+		}
+
+		// The description goes to the end of the line
+		wikifier.subWikify( descCell, &quot;$\\n?&quot; )
+		var descEnd = wikifier.nextMatch
+
+		statusCell.setAttribute( &quot;title&quot;, this.lingo.statusTips[state] )
+		descCell.setAttribute(   &quot;title&quot;, this.lingo.statusTips[state]+this.lingo.descClickTip )
+		if (origCell) {
+			createTiddlyElement( origCell, &quot;div&quot;, null, null, orig )
+			origCell.setAttribute( &quot;title&quot;, this.lingo.origTip )
+			curCell.setAttribute( &quot;title&quot;, this.lingo.curTip )
+		}
+		else {
+			curCell.setAttribute( &quot;title&quot;, this.lingo.curTip2 )
+		}
+		var curDivContents = (state==this.NASCENT)? &quot;?&quot; : cur
+		var curDiv = createTiddlyElement( curCell, &quot;div&quot;, null, null, curDivContents )
+		spentCell.setAttribute( &quot;title&quot;, this.lingo.spentTip )
+		var spentDiv = createTiddlyElement( spentCell, &quot;div&quot;, null, null, spent )
+		remCell.setAttribute( &quot;title&quot;, this.lingo.remTip )
+		var remDiv = createTiddlyElement( remCell, &quot;div&quot;, null, null, rem )
+
+		// Handle double-click on the description by going
+		// into edit mode and selecting the description
+		descCell.ondblclick = this.editDescription( tiddler, end, descEnd )
+
+		function appTitle( el, suffix ) {
+			el.setAttribute( &quot;title&quot;, el.getAttribute(&quot;title&quot;)+suffix )
+		}
+
+		// For incomplete tasks, handle double-click on the bullet by marking the task complete
+		if ( state != this.DONE ) {
+			appTitle( statusCell, this.lingo.statusClickTip )
+			statusCell.ondblclick = this.markTaskComplete( tiddler, start, end, macroName, orig, cur, state )
+		}
+		// For complete ones, handle double-click on the bullet by letting you adjust the time spent
+		else {
+			appTitle( statusCell, this.lingo.statusDoneTip )
+			statusCell.ondblclick = this.adjustTimeSpent( tiddler, start, end, macroName, orig, cur, spent )
+		}
+
+		// Add click handlers for the numeric cells.
+		if ( state != this.DONE ) {
+			appTitle( curCell, this.lingo.clickTip )
+			curDiv.className = &quot;adjustable&quot;
+			curDiv.onclick = this.adjustCurrentEstimate( tiddler, start, end, macroName,
+				orig, cur, spent, curDivContents )
+		}
+		appTitle( spentCell, this.lingo.clickTip )
+		spentDiv.className = &quot;adjustable&quot;
+		spentDiv.onclick = this.adjustTimeSpent( tiddler, start, end, macroName, orig, cur, spent )
+		if ( state == this.LIVE ) {
+			appTitle( remCell, this.lingo.clickTip )
+			remDiv.className = &quot;adjustable&quot;
+			remDiv.onclick = this.adjustTimeRemaining( tiddler, start, end, macroName, orig, cur, spent )
+		}
+	},
+
+	// Puts the tiddler into edit mode, and selects the range of characters
+	// defined by start and end.  Separated for leak prevention in IE.
+	editDescription: function( tiddler, start, end ) {
+		return wrapEventHandler( function(e) {
+			story.displayTiddler( null, tiddler.title, DEFAULT_EDIT_TEMPLATE )
+			var tiddlerElement = document.getElementById( story.idPrefix + tiddler.title )
+			window.scrollTo( 0, ensureVisible(tiddlerElement) )
+			var element = story.findEditField( tiddler.title, &quot;text&quot; )
+			if ( element &amp;&amp; element.tagName.toLowerCase() == &quot;textarea&quot; ) {
+				// Back up one char if the last char's a newline
+				if ( tiddler.text[end-1] == '\n' )
+					--end
+				element.focus()
+				if ( element.setSelectionRange != undefined ) { // Mozilla
+					element.setSelectionRange( start, end )
+					// Damn mozilla doesn't scroll to visible.  Approximate.
+					var max = 0.0 + element.scrollHeight
+					var len = element.textLength
+					var top = max*start/len, bot = max*end/len
+					element.scrollTop = Math.min( top, (bot+top-element.clientHeight)/2 )
+				}
+				else if ( element.createTextRange != undefined ) { // IE
+					var range = element.createTextRange()
+					range.collapse()
+					range.moveEnd(&quot;character&quot;, end)
+					range.moveStart(&quot;character&quot;, start)
+					range.select()
+				}
+				else // Other? Too bad, just select the whole thing.
+					element.select()
+				return false
+			}
+			else
+				return true
+		} )
+	},
+
+	// Modifies a task macro call such that the task appears complete.
+	markTaskComplete: function( tiddler, start, end, macroName, orig, cur, state ) {
+		var macro = this, text = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			if ( state == macro.NASCENT )
+				orig = cur = 0
+			// The second &quot;cur&quot; in the call below bumps up the time spent
+			// to match the current estimate.
+			macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, cur )
+			return false
+		} )
+	},
+
+	// Asks the user for an adjustment to the current estimate, modifies the macro call accordingly.
+	adjustCurrentEstimate: function( tiddler, start, end, macroName, orig, cur, spent, curDivContents ) {
+		var macro = this, text = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var txt = prompt( macro.lingo.curPrompt, curDivContents )
+			if ( txt != null ) {
+				var a = macro.breakInput( txt )
+				cur = macro.offset( cur, a[0] )
+				if ( a.length &gt; 1 )
+					spent = macro.offset( spent, a[1] )
+				macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, spent )
+			}
+			return false
+		} )
+	},
+
+	// Asks the user for an adjustment to the time spent, modifies the macro call accordingly.
+	adjustTimeSpent: function( tiddler, start, end, macroName, orig, cur, spent ) {
+		var macro = this, text = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var txt = prompt( macro.lingo.spentPrompt, spent )
+			if ( txt != null ) {
+				var a = macro.breakInput( txt )
+				spent = macro.offset( spent, a[0] )
+				var rem = cur - spent
+				if ( a.length &gt; 1 ) {
+					rem = macro.offset( rem, a[1] )
+					cur = spent + rem
+				}
+				macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, spent )
+			}
+			return false
+		} )
+	},
+
+	// Asks the user for an adjustment to the time remaining, modifies the macro call accordingly.
+	adjustTimeRemaining: function( tiddler, start, end, macroName, orig, cur, spent ) {
+		var macro = this
+		var text  = tiddler.text
+		var rem   = cur - spent
+		return wrapEventHandler( function(e) {
+			if ( text !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var txt = prompt( macro.lingo.remPrompt, rem )
+			if ( txt != null ) {
+				var a = macro.breakInput( txt )
+				var newRem = macro.offset( rem, a[0] )
+				if ( newRem &gt; rem || a.length &gt; 1 )
+					cur += (newRem - rem)
+				else
+					spent += (rem - newRem)
+				if ( a.length &gt; 1 )
+					spent = macro.offset( spent, a[1] )
+				macro.replaceMacroCall( tiddler, start, end, macroName, orig, cur, spent )
+			}
+			return false
+		} )
+	},
+
+	// Breaks input at spaces &amp; commas, returns array
+	breakInput: function( txt ) {
+		var a = txt.trim().split( /[\s,]+/ )
+		if ( a.length == 0 )
+			a = [NaN]
+		return a
+	},
+
+	// Adds to, subtracts from, or replaces a numeric value
+	offset: function( num, txt ) {
+		if ( txt == &quot;&quot; || typeof(txt) != &quot;string&quot; )
+			return NaN
+		if ( txt.match(/^[+-]/) )
+			return num + (+txt)
+		return +txt
+	},
+
+	// Does some error checking, then replaces the indicated macro
+	// call within the text of the given tiddler.
+	replaceMacroCall: function( tiddler, start, end, macroName, orig, cur, spent )
+	{
+		if ( isNaN(cur+spent) ) {
+			alert( this.lingo.numbersOnly )
+			return
+		}
+		if ( spent &lt; 0 || cur &lt; 0 ) {
+			alert( this.lingo.noNegative )
+			return
+		}
+		if ( isNaN(orig) )
+			orig = cur
+		if ( spent &gt; cur )
+			cur = spent
+		var text = tiddler.text.substring(0,start) + &quot;&lt;&lt;&quot; + macroName + &quot; &quot; +
+			orig + &quot; &quot; + cur + &quot; &quot; + spent + &quot;&gt;&gt;&quot; + tiddler.text.substring(end)
+		var title = tiddler.title
+		store.saveTiddler( title, title, text, config.options.txtUserName, new Date(), undefined )
+		//story.refreshTiddler( title, null, true )
+		if ( config.options.chkAutoSave )
+			saveChanges()
+	}
+}
+//}}}
+/***
+!Tasksum Macro
+Usage:
+&gt; {{{&lt;&lt;tasksum &quot;start&quot; [&quot;here&quot; [intro]]&gt;&gt;}}}
+or:
+&gt; {{{&lt;&lt;tasksum &quot;end&quot; [intro]&gt;&gt;}}}
+Put one of the {{{&lt;&lt;tasksum start&gt;&gt;}}} lines before the tasks you want to summarize, and an {{{end}}} line after them.  By default, the summary goes at the end; if you include {{{here}}} in the start line, the summary will go at the top.  The intro argument, if supplied, replaces the default text introducing the summary.
+***/
+//{{{
+config.macros.tasksum = {
+
+	// Translatable text:
+	lingo: {
+		unrecVerb:	&quot;&lt;&lt;%0&gt;&gt; requires 'start' or 'end' as its first argument&quot;,
+		mustMatch:	&quot;&lt;&lt;%0 end&gt;&gt; must match a preceding &lt;&lt;%0 start&gt;&gt;&quot;,
+		defIntro:	&quot;Task summary:&quot;,
+		nascentSum:	&quot;''%0 not estimated''&quot;,
+		doneSum:	&quot;%0 complete (in %1 hours)&quot;,
+		liveSum:	&quot;%0 ongoing (%1 hours so far, ''%2 hours remaining'')&quot;,
+		overSum:	&quot;Total overestimate: %0%.&quot;,
+		underSum:	&quot;Total underestimate: %0%.&quot;,
+		descPattern:	&quot;%0 %1. %2&quot;,
+                origTip:	&quot;Total original estimates in hours&quot;,
+		curTip:		&quot;Total current estimates in hours&quot;,
+		spentTip:	&quot;Total hours spent on tasks&quot;,
+		remTip:		&quot;Total hours remaining&quot;
+	},
+
+	// The macro handler
+	handler: function( place, macroName, params, wikifier, paramString, tiddler )
+	{
+		var sums = this.tasksums
+		if ( params[0] == &quot;start&quot; ) {
+			sums.unshift([])
+			if ( params[1] == &quot;here&quot; ) {
+				sums[0].intro = params[2] || this.lingo.defIntro
+				sums[0].place = place
+				sums[0].placement = place.childNodes.length
+			}
+		}
+		else if ( params[0] == &quot;end&quot; ) {
+			if ( ! sums.length )
+				throw Error( this.lingo.mustMatch.format([macroName]) )
+			var list = sums.shift()
+			var intro = list.intro || params[1] || this.lingo.defIntro
+			var nNascent=0, nLive=0, nDone=0, nMine=0
+			var totLiveSpent=0, totDoneSpent=0
+			var totOrig=0, totCur=0, totSpent=0
+			for ( var i=0; i &lt; list.length; ++i ) {
+				var a = list[i]
+				if ( a.length &gt; 3 ) {
+					nNascent 	+= a[0]
+					nLive 		+= a[1]
+					nDone 		+= a[2]
+					totLiveSpent 	+= a[3]
+					totDoneSpent 	+= a[4]
+					totOrig 	+= a[5]
+					totCur 		+= a[6]
+					totSpent 	+= a[7]
+					if ( a.owner == tiddler )
+						nMine	+= a[8]
+				}
+				else {
+					if ( a.owner == tiddler )
+						++nMine
+					if ( isNaN(a[0]) ) {
+						++nNascent
+					}
+					else {
+						if ( a[1] &gt; a[2] ) {
+							++nLive
+							totLiveSpent += a[2]
+						}
+						else {
+							++nDone
+							totDoneSpent += a[2]
+						}
+						totOrig  += a[0]
+						totCur   += a[1]
+						totSpent += a[2]
+					}
+				}
+			}
+
+			// If we're nested, push a summary outward
+                        if ( sums.length ) {
+				var summary = [nNascent, nLive, nDone, totLiveSpent, totDoneSpent,
+						totOrig, totCur, totSpent, nMine]
+				summary.owner = tiddler
+				sums[0].push( summary )
+			}
+
+			var descs = [], styles = []
+			if ( nNascent &gt; 0 ) {
+				descs.push( this.lingo.nascentSum.format([nNascent]) )
+				styles.push( &quot;nascent&quot; )
+			}
+			if ( nDone &gt; 0 )
+				descs.push( this.lingo.doneSum.format([nDone, totDoneSpent]) )
+			if ( nLive &gt; 0 ) {
+				descs.push( this.lingo.liveSum.format([nLive, totLiveSpent, totCur-totSpent]) )
+				styles.push( &quot;live&quot; )
+			}
+			else
+				styles.push( &quot;done&quot; )
+			var off = &quot;&quot;
+			if ( totOrig &gt; totCur )
+				off = this.lingo.overSum.format( [Math.round(100.0*(totOrig-totCur)/totCur)] )
+			else if ( totCur &gt; totOrig )
+				off = this.lingo.underSum.format( [Math.round(100.0*(totCur-totOrig)/totOrig)] )
+
+			var top		= (list.intro != undefined)
+			var table	= createTiddlyElement( null, &quot;table&quot;, null, &quot;tasksum &quot;+(top?&quot;top&quot;:&quot;bottom&quot;) )
+			var tbody	= createTiddlyElement( table, &quot;tbody&quot; )
+			var row		= createTiddlyElement( tbody, &quot;tr&quot;, null, styles.join(&quot; &quot;) )
+			var descCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;description&quot; )
+
+			var description = this.lingo.descPattern.format( [intro, descs.join(&quot;, &quot;), off] )
+			wikify( description, descCell, null, tiddler )
+
+			var origCell	= totOrig == totCur? null
+					: createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric original&quot;, totOrig )
+			var curCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric current&quot;, totCur )
+			var spentCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric spent&quot;, totSpent )
+			var remCell	= createTiddlyElement( row, &quot;td&quot;, null, &quot;numeric remaining&quot;, totCur-totSpent )
+
+			if ( origCell )
+				origCell.setAttribute( &quot;title&quot;, this.lingo.origTip )
+			curCell  .setAttribute( &quot;title&quot;, this.lingo.curTip )
+			spentCell.setAttribute( &quot;title&quot;, this.lingo.spentTip )
+			remCell  .setAttribute( &quot;title&quot;, this.lingo.remTip )
+
+			// Discard the table if there are no tasks
+			if ( list.length &gt; 0 ) {
+				var place = top? list.place : place
+				var placement = top? list.placement : place.childNodes.length
+				if ( placement &gt;= place.childNodes.length )
+					place.appendChild( table )
+				else
+					place.insertBefore( table, place.childNodes[placement] )
+			}
+		}
+		else
+			throw Error( this.lingo.unrecVerb.format([macroName]) )
+
+		// If we're wikifying, and are followed by end-of-line, swallow the newline.
+		if ( wikifier &amp;&amp; wikifier.source.charAt(wikifier.nextMatch) == &quot;\n&quot; )
+			++wikifier.nextMatch
+	},
+
+	// This is the stack of pending summaries
+	tasksums: []
+}
+//}}}
+/***
+!Taskadder Macro
+Usage:
+&gt; {{{&lt;&lt;taskadder [&quot;above&quot;|&quot;below&quot;|&quot;focus&quot;|&quot;nofocus&quot;]...&gt;&gt;}}}
+Creates a line with text entry fields for a description and an estimate.  By default, puts focus in the description field and adds tasks above the entry fields.  Use {{{nofocus}}} to not put focus in the description field.  Use {{{below}}} to add tasks below the entry fields.
+***/
+//{{{
+config.macros.taskadder = {
+
+	// Translatable text:
+	lingo: {
+		unrecParam:	&quot;&lt;&lt;%0&gt;&gt; doesn't recognize '%1' as a parameter&quot;,
+		descTip:	&quot;Describe a new task&quot;,
+		curTip:		&quot;Estimate how long in hours the task will take&quot;,
+		buttonText:	&quot;add task&quot;,
+		buttonTip:	&quot;Add a new task with the description and estimate as entered&quot;,
+		notCurrent:	&quot;The tiddler has been modified since it was displayed, please redisplay it before adding a task this way.&quot;,
+
+		eol:		&quot;eol&quot;
+	},
+
+	// The macro handler
+	handler: function( place, macroName, params, wikifier, paramString, tiddler )
+	{
+		var above = true
+		var focus = false
+
+		while ( params.length &gt; 0 ) {
+			var p = params.shift()
+			switch (p) {
+			case &quot;above&quot;: 	above = true;  break
+			case &quot;below&quot;: 	above = false; break
+			case &quot;focus&quot;: 	focus = true;  break
+			case &quot;nofocus&quot;:	focus = false; break
+			default:	throw Error( this.lingo.unrecParam.format([macroName, p]) )
+			}
+		}
+
+		// If we're followed by end-of-line, swallow the newline.
+		if ( wikifier.source.charAt(wikifier.nextMatch) == &quot;\n&quot; )
+			++wikifier.nextMatch
+
+		var where	= above? wikifier.matchStart : wikifier.nextMatch
+
+		var table	= createTiddlyElement( place, &quot;table&quot;, null, &quot;task&quot; )
+		var tbody	= createTiddlyElement( table, &quot;tbody&quot; )
+		var row		= createTiddlyElement( tbody, &quot;tr&quot; )
+		var statusCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;status&quot; )
+		var descCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;description&quot; )
+		var curCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;numeric&quot; )
+		var addCell	= createTiddlyElement( row,   &quot;td&quot;, null, &quot;addtask&quot; )
+
+		var descId	= this.generateId()
+		var curId	= this.generateId()
+		var descInput	= createTiddlyElement( descCell, &quot;input&quot;, descId )
+		var curInput	= createTiddlyElement( curCell,  &quot;input&quot;, curId  )
+
+		descInput.setAttribute( &quot;type&quot;, &quot;text&quot; )
+		curInput .setAttribute( &quot;type&quot;, &quot;text&quot; )
+		descInput.setAttribute( &quot;size&quot;, &quot;40&quot;)
+		curInput .setAttribute( &quot;size&quot;, &quot;6&quot; )
+		descInput.setAttribute( &quot;autocomplete&quot;, &quot;off&quot; );
+		curInput .setAttribute( &quot;autocomplete&quot;, &quot;off&quot; );
+		descInput.setAttribute( &quot;title&quot;, this.lingo.descTip );
+		curInput .setAttribute( &quot;title&quot;, this.lingo.curTip  );
+
+		var addAction	= this.addTask( tiddler, where, descId, curId, above )
+		var addButton	= createTiddlyButton( addCell, this.lingo.buttonText, this.lingo.buttonTip, addAction )
+
+		descInput.onkeypress = this.handleEnter(addAction)
+		curInput .onkeypress = descInput.onkeypress
+		addButton.onkeypress = this.handleSpace(addAction)
+		if ( focus || tiddler.taskadderLocation == where ) {
+			descInput.focus()
+			descInput.select()
+		}
+	},
+
+	// Returns a function that inserts a new task macro into the tiddler.
+	addTask: function( tiddler, where, descId, curId, above ) {
+		var macro = this, oldText = tiddler.text
+		return wrapEventHandler( function(e) {
+			if ( oldText !== tiddler.text ) {
+				alert( macro.lingo.notCurrent )
+				return false
+			}
+			var desc	= document.getElementById(descId).value
+			var cur		= document.getElementById(curId) .value
+			var init	= tiddler.text.substring(0,where) + &quot;&lt;&lt;task &quot; + cur + &quot;&gt;&gt; &quot; + desc + &quot;\n&quot;
+			var text	= init + tiddler.text.substring(where)
+			var title	= tiddler.title
+			tiddler.taskadderLocation = (above? init.length : where)
+			try {
+				store.saveTiddler( title, title, text, config.options.txtUserName, new Date(), undefined )
+				//story.refreshTiddler( title, null, true )
+			}
+			finally {
+				delete tiddler.taskadderLocation
+			}
+			if ( config.options.chkAutoSave )
+				saveChanges()
+		} )
+	},
+
+	// Returns an event handler that delegates to two other functions: &quot;matches&quot; to decide
+	// whether to consume the event, and &quot;addTask&quot; to actually perform the work.
+	handleGeneric: function( addTask, matches ) {
+		return function(e) {
+			if (!e) var e = window.event
+			var consume = false
+			if ( matches(e) ) {
+				consume = true
+				addTask( e )
+			}
+			e.cancelBubble = consume;
+			if ( consume &amp;&amp; e.stopPropagation ) e.stopPropagation();
+			return !consume;
+		}
+	},
+
+	// Returns an event handler that handles enter keys by calling another event handler
+	handleEnter: function( addTask ) {
+		return this.handleGeneric( addTask, function(e){return e.keyCode == 13 || e.keyCode == 10} ) // Different codes for Enter
+	},
+
+	// Returns an event handler that handles the space key by calling another event handler
+	handleSpace: function( addTask ) {
+		return this.handleGeneric( addTask, function(e){return (e.charCode||e.keyCode) == 32} )
+	},
+
+	counter: 0,
+	generateId: function() {
+		return &quot;taskadder:&quot; + String(this.counter++)
+	}
+}
+//}}}
+/***
+!Stylesheet
+***/
+//{{{
+var stylesheet = '\
+.viewer table.task, table.tasksum {\
+	width: 100%;\
+	padding: 0;\
+	border-collapse: collapse;\
+}\
+.viewer table.task {\
+	border: none;\
+	margin: 0;\
+}\
+table.tasksum, .viewer table.tasksum {\
+	border: solid 2px #999;\
+	margin: 3px 0;\
+}\
+table.tasksum td {\
+	text-align: center;\
+	border: 1px solid #ddd;\
+	background-color: #ffc;\
+	vertical-align: middle;\
+	margin: 0;\
+	padding: 0;\
+}\
+.viewer table.task tr {\
+	border: none;\
+}\
+.viewer table.task td {\
+	text-align: center;\
+	vertical-align: baseline;\
+	border: 1px solid #fff;\
+	background-color: inherit;\
+	margin: 0;\
+	padding: 0;\
+}\
+td.numeric {\
+	width: 3em;\
+}\
+table.task td.numeric div {\
+	border: 1px solid #ddd;\
+	background-color: #ffc;\
+	margin: 1px 0;\
+	padding: 0;\
+}\
+table.task td.original div {\
+	background-color: #fdd;\
+}\
+table.tasksum td.original {\
+	background-color: #fdd;\
+}\
+table.tasksum td.description {\
+	background-color: #e8e8e8;\
+}\
+table.task td.status {\
+	width: 1.5em;\
+	cursor: default;\
+}\
+table.task td.description, table.tasksum td.description {\
+	width: auto;\
+	text-align: left;\
+	padding: 0 3px;\
+}\
+table.task.done td.status,table.task.done td.description {\
+	color: #ccc;\
+}\
+table.task.done td.current, table.task.done td.remaining {\
+	visibility: hidden;\
+}\
+table.task.done td.spent div, table.tasksum tr.done td.current,\
+table.tasksum tr.done td.spent, table.tasksum tr.done td.remaining {\
+	background-color: #eee;\
+	color: #aaa;\
+}\
+table.task.nascent td.description {\
+	color: #844;\
+}\
+table.task.nascent td.current div, table.tasksum tr.nascent td.numeric.current {\
+	font-weight: bold;\
+	color: #c00;\
+	background-color: #def;\
+}\
+table.task.nascent td.spent, table.task.nascent td.remaining {\
+	visibility: hidden;\
+}\
+td.remaining {\
+	font-weight: bold;\
+}\
+.adjustable {\
+	cursor: pointer; \
+}\
+table.task input {\
+	display: block;\
+	width: 100%;\
+	font: inherit;\
+	margin: 2px 0;\
+	padding: 0;\
+	border: 1px inset #999;\
+}\
+table.task td.numeric input {\
+	background-color: #ffc;\
+	text-align: center;\
+}\
+table.task td.addtask {\
+	width: 6em;\
+	border-left: 2px solid white;\
+	vertical-align: middle;\
+}\
+'
+setStylesheet( stylesheet, &quot;TaskMacroPluginStylesheet&quot; )
+//}}}
+</pre>
+</div>
+<div title="TaskMacroReleaseNotes" modifier="LukeBlanshard" modified="200605102059" created="200605020308" tags="TaskMacro" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605102059">
+<pre>!!Changes in 1.1.0
+* Made the macros work in nested tiddlers (ie when one tiddler includes another using {{{&lt;&lt;tiddler&gt;&gt;}}} or something similar):
+** Task summaries in the outer tiddler include the tasks from the inner one
+** Using the editing shortcuts on the tasks as displayed in the outer tiddler correctly changes the inner tiddler and also redisplays the outer one
+** Added sanity checks to the editing shortcuts so they will refuse to work if the tiddler has been modified behind their backs
+* Made some small usability fixes:
+** The &quot;add task&quot; button now responds to the Space key (hat tip: Daniel Baird)
+** Double-clicking on a completed task's bullet now does the same thing as clicking on the elapsed time: it lets you adjust the time spent, giving you the option of resurrecting the task (hat tip: ~JackF)
+** Reworked the focus handling of the taskadder macro so it works more intuitively, by refocusing on the same adder you just used
+</pre>
+</div>
+<div title="TaskMacroTutorial" modifier="LukeBlanshard" modified="200605102059" created="200604082009" tags="TaskMacro" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200605102059">
+<pre>The task macro provided by the TaskMacroPlugin is for planning, estimating, and tracking detailed tasks such as those required for writing software.  It is inspired by [[Joel Spolsky|http://www.joelonsoftware.com/articles/fog0000000245.html]]'s method for scheduling software development, also popularized by [[Voo2do|http://voo2do.com]] and [[XPlanner|http://xplanner.org]].
+
+For changes since the previous version, see the TaskMacroReleaseNotes.
+
+This tutorial leads you through the use of the task macro itself, and supporting macros that summarize lists of tasks and simplify the adding of tasks to a list.  Follow along by clicking the links below.  Or click the little down-arrow next to this tiddler's title, above, and choose &quot;Open all&quot; to have all the tutorial sections displayed at once.
+
+</pre>
+</div>
+<div title="TaskSummaryViewTemplate" modifier="LukeBlanshard" modified="200604091859" created="200604082012" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200604091859">
+<pre>&lt;!---
+Includes portions of [[TagglyTaggingViewTemplate|http://simonbaird.com/mptw/#TagglyTaggingViewTemplate]], v1.2 (16-Jan-2006).
+Also adds a pair of tasksum macros around the tiddler, to summarize any contained tasks at the top.  Removes the &quot;-&quot; in front of closeTiddler, which can easily bite you if you have a focusable element in a tiddler, such as a taskadder entry field.
+Portions written by Luke Blanshard are hereby released into the public domain.
+---&gt;
+&lt;!--{{{--&gt;
+&lt;div class=&quot;toolbar&quot; macro=&quot;toolbar closeTiddler closeOthers +editTiddler permalink references jump newHere&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;tagglyTagged&quot; macro=&quot;tags&quot;&gt;&lt;/div&gt;
+&lt;div&gt;&lt;span class=&quot;title&quot; macro=&quot;view title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;miniTag&quot; macro=&quot;miniTag&quot;&gt;&lt;/span&gt;&lt;/div&gt;
+&lt;div macro=&quot;tasksum start here&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;viewer&quot; macro=&quot;view text wikified&quot;&gt;&lt;/div&gt;
+&lt;div macro=&quot;tasksum end&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;tagglyTagging&quot; macro=&quot;tagglyListWithSort&quot;&gt;&lt;/div&gt;
+&lt;!--}}}--&gt;
+</pre>
+</div>
+<div title="Tasks" modifier="CehTeh" modified="200804011836" created="200804011634" changecount="16">
+<pre>! Things which are imminent to do
+
+&lt;&lt;task 1 1 0.25&gt;&gt; Testsuite: Valgrind suppression file generation, glibc/pthreads leak some memory at the end of the applications, this is ok, we have to integrate this as suppressions into the testsuite, initial work done by cehteh
+&lt;&lt;task &gt;&gt; Testsuite: expected 'out:' and 'err:' should be shell glob or regex lines not exact strings. The output shall be matched against the current 'out:' or 'err:' line, on success the check continues with the actual expected glob, on fail the next glob is tried. When that fails the test is counted as failure.
+&lt;&lt;task &gt;&gt; Testsuite: when no expected 'err:' statements are in a test then stderr, including valgrind reports gets ignored, this is a bug. stderr should be filtered for nobug logging events but everything else should be checked for unexpected output.
+&lt;&lt;task &gt;&gt; Website: asciidoc switchover, git integration, rebuild website on push
+&lt;&lt;taskadder&gt;&gt;
+</pre>
+</div>
+<div title="TextAreaPlugin" modifier="Jeremy" created="200601261745" tags="systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200601261745">
+<pre>/***
+''TextAreaPlugin for TiddlyWiki version 2.0''
+^^author: Eric Shulman - ELS Design Studios
+source: http://www.elsdesign.com/tiddlywiki/#TextAreaPlugin
+license: [[Creative Commons Attribution-ShareAlike 2.5 License|http://creativecommons.org/licenses/by-sa/2.5/]]^^
+
+This plugin 'hijacks' the TW core function, ''Story.prototype.focusTiddler()'', so it can add special 'keyDown' handlers to adjust several behaviors associated with the textarea control used in the tiddler editor.  Specifically, it:
+* Adds text search INSIDE of edit fields.^^
+Use ~CTRL-F for &quot;Find&quot; (prompts for search text), and ~CTRL-G for &quot;Find Next&quot; (uses previous search text)^^
+* Enables TAB characters to be entered into field content^^
+(instead of moving to next field)^^
+* Option to set cursor at top of edit field instead of auto-selecting contents^^
+(see configuration section for checkbox)^^
+!!!!!Configuration
+&lt;&lt;&lt;
+&lt;&lt;option chkDisableAutoSelect&gt;&gt; place cursor at start of textarea instead of pre-selecting content
+&lt;&lt;option chkTextAreaExtensions&gt;&gt; add control-f (find), control-g (find again) and allow TABs as input in textarea
+&lt;&lt;&lt;
+!!!!!Installation
+&lt;&lt;&lt;
+Import (or copy/paste) the following tiddlers into your document:
+''TextAreaPlugin'' (tagged with &lt;&lt;tag systemConfig&gt;&gt;)
+&lt;&lt;&lt;
+!!!!!Revision History
+&lt;&lt;&lt;
+''2006.01.22 [1.0.1]''
+only add extra key processing for TEXTAREA elements (not other edit fields).
+added option to enable/disable textarea keydown extensions (default is &quot;standard keys&quot; only)
+''2006.01.22 [1.0.0]''
+Moved from temporary &quot;System Tweaks&quot; tiddler into 'real' TextAreaPlugin tiddler.
+&lt;&lt;&lt;
+!!!!!Code
+***/
+//{{{
+version.extensions.textAreaPlugin= {major: 1, minor: 0, revision: 1, date: new Date(2006,1,23)};
+//}}}
+
+//{{{
+if (!config.options.chkDisableAutoSelect) config.options.chkDisableAutoSelect=false; // default to standard action
+if (!config.options.chkTextAreaExtensions) config.options.chkTextAreaExtensions=false; // default to standard action
+
+// Focus a specified tiddler. Attempts to focus the specified field, otherwise the first edit field it finds
+Story.prototype.focusTiddler = function(title,field)
+{
+	var tiddler = document.getElementById(this.idPrefix + title);
+	if(tiddler != null)
+		{
+		var children = tiddler.getElementsByTagName(&quot;*&quot;)
+		var e = null;
+		for (var t=0; t&lt;children.length; t++)
+			{
+			var c = children[t];
+			if(c.tagName.toLowerCase() == &quot;input&quot; || c.tagName.toLowerCase() == &quot;textarea&quot;)
+				{
+				if(!e)
+					e = c;
+				if(c.getAttribute(&quot;edit&quot;) == field)
+					e = c;
+				}
+			}
+		if(e)
+			{
+			e.focus();
+			e.select(); // select entire contents
+
+			// TWEAK: add TAB and &quot;find&quot; key handlers
+			if (config.options.chkTextAreaExtensions) // add extra key handlers
+				addKeyDownHandlers(e);
+
+			// TWEAK: option to NOT autoselect contents
+			if (config.options.chkDisableAutoSelect) // set cursor to start of field content
+				if (e.setSelectionRange) e.setSelectionRange(0,0); // for FF
+				else if (e.createTextRange) { var r=e.createTextRange(); r.collapse(true); r.select(); } // for IE
+
+			}
+		}
+}
+//}}}
+
+//{{{
+function addKeyDownHandlers(e)
+{
+	// exit if not textarea or element doesn't allow selections
+	if (e.tagName.toLowerCase()!=&quot;textarea&quot; || !e.setSelectionRange) return;
+
+	// utility function: exits keydown handler and prevents browser from processing the keystroke
+	var processed=function(ev) { ev.cancelBubble=true; if (ev.stopPropagation) ev.stopPropagation(); return false; }
+
+	// capture keypress in edit field
+	e.onkeydown = function(ev) { if (!ev) var ev=window.event;
+
+		// process TAB
+		if (!ev.shiftKey &amp;&amp; ev.keyCode==9) { 
+			// replace current selection with a TAB character
+			var start=e.selectionStart; var end=e.selectionEnd;
+			e.value=e.value.substr(0,start)+String.fromCharCode(9)+e.value.substr(end);
+			// update insertion point, scroll it into view
+			e.setSelectionRange(start+1,start+1);
+			var linecount=e.value.split('\n').length;
+			var thisline=e.value.substr(0,e.selectionStart).split('\n').length-1;
+			e.scrollTop=Math.floor((thisline-e.rows/2)*e.scrollHeight/linecount);
+			return processed(ev);
+		}
+
+		// process CTRL-F (find matching text) or CTRL-G (find next match)
+		if (ev.ctrlKey &amp;&amp; (ev.keyCode==70||ev.keyCode==71)) {
+			// if ctrl-f or no previous search, prompt for search text (default to previous text or current selection)... if no search text, exit
+			if (ev.keyCode==70||!e.find||!e.find.length)
+				{ var f=prompt(&quot;find:&quot;,e.find?e.find:e.value.substring(e.selectionStart,e.selectionEnd)); e.focus(); e.find=f?f:e.find; }
+			if (!e.find||!e.find.length) return processed(ev);
+			// do case-insensitive match with 'wraparound'...  if not found, alert and exit 
+			var newstart=e.value.toLowerCase().indexOf(e.find.toLowerCase(),e.selectionStart+1);
+			if (newstart==-1) newstart=e.value.toLowerCase().indexOf(e.find.toLowerCase());
+			if (newstart==-1) { alert(&quot;'&quot;+e.find+&quot;' not found&quot;); e.focus(); return processed(ev); }
+			// set new selection, scroll it into view, and report line position in status bar
+			e.setSelectionRange(newstart,newstart+e.find.length);
+			var linecount=e.value.split('\n').length;
+			var thisline=e.value.substr(0,e.selectionStart).split('\n').length;
+			e.scrollTop=Math.floor((thisline-1-e.rows/2)*e.scrollHeight/linecount);
+			window.status=&quot;line: &quot;+thisline+&quot;/&quot;+linecount;
+			return processed(ev);
+		}
+	}
+}
+//}}}</pre>
+</div>
+<div title="ToDo" modifier="CehTeh" modified="200804090212" created="200803281330" changecount="4">
+<pre>! Proc layer
+ by ichtho
+
+! Backend
+ by cehteh
+!! File handling
+Opening and accessing huge files for reading and writing
+!!! Manageing File opening, desciptors and handles
+In progress
+!!! Mmaping backend, caching
+Design finished, nothing implemented yet.
+!! Serializer
+Some ideas, nothing done yet.
+!! Scheduler
+Design ideas, nothing done yet.
+
+! Support Libary
+by cehteh and ichthyo
+
+Ongoing efforts as needed, some things already deprecated ;)
+!! Plugin Loader
+Basic implementation finished, not final yet.
+
+! Infrastructure
+!! Testsuite
+Needs some improvements, see [[Tasks]]
+!! Website
+A mockup website is online, raffa experimenting with asciidoc which looks good so far. git integration and automatic generation on push to be done see [[Tasks]]
+!! git / mob repos
+gitweb is up, git repos are established, mob repos are not yet up.
+!! automatic generation and checkout of tiddlywikis and doxygen docs on the server
+currently only a manual rsync script in admin/
+!! automatic builds/test on server, status page
+will be done on the 'devel' vserver. nothing done yet.
+!! Developer Documentation
+Someone might pickup a Doxygen-Maintainer. This is not writing actual documentation but bringing the Documentation comments in the source to a good shape, add formatting tags, ensureing that all docs are properly generated, maintaining a glossary and index, define the order etc.
+</pre>
+</div>
+<div title="video player mockup" modifier="CehTeh" modified="200804090218" created="200804090216" changecount="3">
+<pre>Use the backend, gmerlin/avdecoder and a Player widget to playback videos. This should be a small application which can open and playback many videos from on instance in parallel. Later on scrubbing for this videos might be supported.
+
+The idea here is to show and measure backend and scheduler performance and beeing a proof of concept for the design. It will run independent of the Proc layer but needs quite some work on the backend to be done.</pre>
+</div>
+</div>
+<!--POST-STOREAREA-->
+<!--POST-BODY-START-->
+<!--POST-BODY-END-->
+<script type="text/javascript">
+//<![CDATA[
+//
+// Please note:
+// 
+// * This code is designed to be readable but for compactness it only includes brief comments. You can see fuller comments
+//   in the project Subversion repository at http://svn.tiddlywiki.org/Trunk/core/
+//
+// * You should never need to modify this source code directly. TiddlyWiki is carefully designed to allow deep customisation
+//   without changing the core code. Please consult the development group at http://groups.google.com/group/TiddlyWikiDev
+// 
+
+//--
+//-- Configuration repository
+//--
+
+// Miscellaneous options
+var config = {
+	numRssItems: 20, // Number of items in the RSS feed
+	animDuration: 400, // Duration of UI animations in milliseconds
+	cascadeFast: 20, // Speed for cascade animations (higher == slower)
+	cascadeSlow: 60, // Speed for EasterEgg cascade animations
+	cascadeDepth: 5 // Depth of cascade animation
+};
+
+// Adaptors
+config.adaptors = {};
+
+// Backstage tasks
+config.tasks = {};
+
+// Annotations
+config.annotations = {};
+
+// Custom fields to be automatically added to new tiddlers
+config.defaultCustomFields = {};
+
+// Messages
+config.messages = {
+	messageClose: {},
+	dates: {},
+	tiddlerPopup: {}
+};
+
+// Options that can be set in the options panel and/or cookies
+config.options = {
+	chkRegExpSearch: false,
+	chkCaseSensitiveSearch: false,
+	chkAnimate: true,
+	chkSaveBackups: true,
+	chkAutoSave: false,
+	chkGenerateAnRssFeed: false,
+	chkSaveEmptyTemplate: false,
+	chkOpenInNewWindow: true,
+	chkToggleLinks: false,
+	chkHttpReadOnly: true,
+	chkForceMinorUpdate: false,
+	chkConfirmDelete: true,
+	chkInsertTabs: false,
+	chkUsePreForStorage: true, // Whether to use <pre> format for storage
+	chkDisplayStartupTime: false,
+	txtBackupFolder: "",
+	txtMainTab: "tabTimeline",
+	txtMoreTab: "moreTabAll",
+	txtMaxEditRows: "30",
+	txtFileSystemCharSet: "UTF-8"
+	};
+config.optionsDesc = {};
+	
+// List of notification functions to be called when certain tiddlers are changed or deleted
+config.notifyTiddlers = [
+	{name: "StyleSheetLayout", notify: refreshStyles},
+	{name: "StyleSheetColors", notify: refreshStyles},
+	{name: "StyleSheet", notify: refreshStyles},
+	{name: "StyleSheetPrint", notify: refreshStyles},
+	{name: "PageTemplate", notify: refreshPageTemplate},
+	{name: "SiteTitle", notify: refreshPageTitle},
+	{name: "SiteSubtitle", notify: refreshPageTitle},
+	{name: "ColorPalette", notify: refreshColorPalette},
+	{name: null, notify: refreshDisplay}
+];
+
+// Default tiddler templates
+var DEFAULT_VIEW_TEMPLATE = 1;
+var DEFAULT_EDIT_TEMPLATE = 2;
+config.tiddlerTemplates = {
+	1: "ViewTemplate",
+	2: "EditTemplate"
+};
+
+// More messages (rather a legacy layout that shouldn't really be like this)
+config.views = {
+	wikified: {
+		tag: {}
+	},
+	editor: {
+		tagChooser: {}
+	}
+};
+
+// Backstage tasks
+config.backstageTasks = ["save","sync","importTask","tweak","plugins"];
+
+// Macros; each has a 'handler' member that is inserted later
+config.macros = {
+	today: {},
+	version: {},
+	search: {sizeTextbox: 15},
+	tiddler: {},
+	tag: {},
+	tags: {},
+	tagging: {},
+	timeline: {},
+	allTags: {},
+	list: {
+		all: {},
+		missing: {},
+		orphans: {},
+		shadowed: {},
+		touched: {}
+	},
+	closeAll: {},
+	permaview: {},
+	saveChanges: {},
+	slider: {},
+	option: {},
+	options: {},
+	newTiddler: {},
+	newJournal: {},
+	sparkline: {},
+	tabs: {},
+	gradient: {},
+	message: {},
+	view: {},
+	edit: {},
+	tagChooser: {},
+	toolbar: {},
+	br: {},
+	plugins: {},
+	refreshDisplay: {},
+	importTiddlers: {},
+	sync: {},
+	annotations: {}
+};
+
+// Commands supported by the toolbar macro
+config.commands = {
+	closeTiddler: {},
+	closeOthers: {},
+	editTiddler: {},
+	saveTiddler: {hideReadOnly: true},
+	cancelTiddler: {},
+	deleteTiddler: {hideReadOnly: true},
+	permalink: {},
+	references: {type: "popup"},
+	jump: {type: "popup"},
+	syncing: {type: "popup"},
+	fields: {type: "popup"}
+};
+
+// Browser detection... In a very few places, there's nothing else for it but to know what browser we're using.
+config.userAgent = navigator.userAgent.toLowerCase();
+config.browser = {
+	isIE: config.userAgent.indexOf("msie") != -1 && config.userAgent.indexOf("opera") == -1,
+	isGecko: config.userAgent.indexOf("gecko") != -1,
+	ieVersion: /MSIE (\d.\d)/i.exec(config.userAgent), // config.browser.ieVersion[1], if it exists, will be the IE version string, eg "6.0"
+	isSafari: config.userAgent.indexOf("applewebkit") != -1,
+	isBadSafari: !((new RegExp("[\u0150\u0170]","g")).test("\u0150")),
+	firefoxDate: /gecko\/(\d{8})/i.exec(config.userAgent), // config.browser.firefoxDate[1], if it exists, will be Firefox release date as "YYYYMMDD"
+	isOpera: config.userAgent.indexOf("opera") != -1,
+	isLinux: config.userAgent.indexOf("linux") != -1,
+	isUnix: config.userAgent.indexOf("x11") != -1,
+	isMac: config.userAgent.indexOf("mac") != -1,
+	isWindows: config.userAgent.indexOf("win") != -1
+};
+
+// Basic regular expressions
+config.textPrimitives = {
+	upperLetter: "[A-Z\u00c0-\u00de\u0150\u0170]",
+	lowerLetter: "[a-z0-9_\\-\u00df-\u00ff\u0151\u0171]",
+	anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]",
+	anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]"
+};
+if(config.browser.isBadSafari) {
+	config.textPrimitives = {
+		upperLetter: "[A-Z\u00c0-\u00de]",
+		lowerLetter: "[a-z0-9_\\-\u00df-\u00ff]",
+		anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff]",
+		anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff]"
+	};
+}
+config.textPrimitives.sliceSeparator = "::";
+config.textPrimitives.urlPattern = "[a-z]{3,8}:[^\\s:'\"][^\\s'\"]*(?:/|\\b)";
+config.textPrimitives.unWikiLink = "~";
+config.textPrimitives.wikiLink = "(?:(?:" + config.textPrimitives.upperLetter + "+" +
+	config.textPrimitives.lowerLetter + "+" +
+	config.textPrimitives.upperLetter +
+	config.textPrimitives.anyLetter + "*)|(?:" +
+	config.textPrimitives.upperLetter + "{2,}" +
+	config.textPrimitives.lowerLetter + "+))";
+
+config.textPrimitives.cssLookahead = "(?:(" + config.textPrimitives.anyLetter + "+)\\(([^\\)\\|\\n]+)(?:\\):))|(?:(" + config.textPrimitives.anyLetter + "+):([^;\\|\\n]+);)";
+config.textPrimitives.cssLookaheadRegExp = new RegExp(config.textPrimitives.cssLookahead,"mg");
+
+config.textPrimitives.brackettedLink = "\\[\\[([^\\]]+)\\]\\]";
+config.textPrimitives.titledBrackettedLink = "\\[\\[([^\\[\\]\\|]+)\\|([^\\[\\]\\|]+)\\]\\]";
+config.textPrimitives.tiddlerForcedLinkRegExp = new RegExp("(?:" + config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" + 
+	config.textPrimitives.urlPattern + ")","mg");
+config.textPrimitives.tiddlerAnyLinkRegExp = new RegExp("("+ config.textPrimitives.wikiLink + ")|(?:" +
+	config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" +
+	config.textPrimitives.urlPattern + ")","mg");
+
+config.glyphs = {
+	browsers: [
+		function() {return config.browser.isIE;},
+		function() {return true}
+	],
+	currBrowser: null,
+	codes: {
+		downTriangle: ["\u25BC","\u25BE"],
+		downArrow: ["\u2193","\u2193"],
+		bentArrowLeft: ["\u2190","\u21A9"],
+		bentArrowRight: ["\u2192","\u21AA"]
+	}
+};
+
+//--
+//-- Shadow tiddlers
+//--
+
+config.shadowTiddlers = {
+	StyleSheet: "",
+	MarkupPreHead: "<!--{{{-->\n<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>\n<!--}}}-->",
+	MarkupPostHead: "",
+	MarkupPreBody: "",
+	MarkupPostBody: "",
+	TabTimeline: '<<timeline>>',
+	TabAll: '<<list all>>',
+	TabTags: '<<allTags excludeLists>>',
+	TabMoreMissing: '<<list missing>>',
+	TabMoreOrphans: '<<list orphans>>',
+	TabMoreShadowed: '<<list shadowed>>',
+	AdvancedOptions: '<<options>>',
+	PluginManager: '<<plugins>>',
+	ImportTiddlers: '<<importTiddlers>>'
+};
+
+//--
+//-- Translateable strings
+//--
+
+// Strings in "double quotes" should be translated; strings in 'single quotes' should be left alone
+
+merge(config.options,{
+	txtUserName: "YourName"});
+
+merge(config.tasks,{
+	save: {text: "save", tooltip: "Save your changes to this TiddlyWiki", action: saveChanges},
+	sync: {text: "sync", tooltip: "Synchronise changes with other TiddlyWiki files and servers", content: '<<sync>>'},
+	importTask: {text: "import", tooltip: "Import tiddlers and plugins from other TiddlyWiki files and servers", content: '<<importTiddlers>>'},
+	tweak: {text: "tweak", tooltip: "Tweak the appearance and behaviour of TiddlyWiki", content: '<<options>>'},
+	plugins: {text: "plugins", tooltip: "Manage installed plugins", content: '<<plugins>>'}
+});
+
+// Options that can be set in the options panel and/or cookies
+merge(config.optionsDesc,{
+	txtUserName: "Username for signing your edits",
+	chkRegExpSearch: "Enable regular expressions for searches",
+	chkCaseSensitiveSearch: "Case-sensitive searching",
+	chkAnimate: "Enable animations",
+	chkSaveBackups: "Keep backup file when saving changes",
+	chkAutoSave: "Automatically save changes",
+	chkGenerateAnRssFeed: "Generate an RSS feed when saving changes",
+	chkSaveEmptyTemplate: "Generate an empty template when saving changes",
+	chkOpenInNewWindow: "Open external links in a new window",
+	chkToggleLinks: "Clicking on links to open tiddlers causes them to close",
+	chkHttpReadOnly: "Hide editing features when viewed over HTTP",
+	chkForceMinorUpdate: "Don't update modifier username and date when editing tiddlers",
+	chkConfirmDelete: "Require confirmation before deleting tiddlers",
+	chkInsertTabs: "Use the tab key to insert tab characters instead of moving between fields",
+	txtBackupFolder: "Name of folder to use for backups",
+	txtMaxEditRows: "Maximum number of rows in edit boxes",
+	txtFileSystemCharSet: "Default character set for saving changes (Firefox/Mozilla only)"});
+
+merge(config.messages,{
+	customConfigError: "Problems were encountered loading plugins. See PluginManager for details",
+	pluginError: "Error: %0",
+	pluginDisabled: "Not executed because disabled via 'systemConfigDisable' tag",
+	pluginForced: "Executed because forced via 'systemConfigForce' tag",
+	pluginVersionError: "Not executed because this plugin needs a newer version of TiddlyWiki",
+	nothingSelected: "Nothing is selected. You must select one or more items first",
+	savedSnapshotError: "It appears that this TiddlyWiki has been incorrectly saved. Please see http://www.tiddlywiki.com/#DownloadSoftware for details",
+	subtitleUnknown: "(unknown)",
+	undefinedTiddlerToolTip: "The tiddler '%0' doesn't yet exist",
+	shadowedTiddlerToolTip: "The tiddler '%0' doesn't yet exist, but has a pre-defined shadow value",
+	tiddlerLinkTooltip: "%0 - %1, %2",
+	externalLinkTooltip: "External link to %0",
+	noTags: "There are no tagged tiddlers",
+	notFileUrlError: "You need to save this TiddlyWiki to a file before you can save changes",
+	cantSaveError: "It's not possible to save changes. Possible reasons include:\n- your browser doesn't support saving (Firefox, Internet Explorer, Safari and Opera all work if properly configured)\n- the pathname to your TiddlyWiki file contains illegal characters\n- the TiddlyWiki HTML file has been moved or renamed",
+	invalidFileError: "The original file '%0' does not appear to be a valid TiddlyWiki",
+	backupSaved: "Backup saved",
+	backupFailed: "Failed to save backup file",
+	rssSaved: "RSS feed saved",
+	rssFailed: "Failed to save RSS feed file",
+	emptySaved: "Empty template saved",
+	emptyFailed: "Failed to save empty template file",
+	mainSaved: "Main TiddlyWiki file saved",
+	mainFailed: "Failed to save main TiddlyWiki file. Your changes have not been saved",
+	macroError: "Error in macro <<\%0>>",
+	macroErrorDetails: "Error while executing macro <<\%0>>:\n%1",
+	missingMacro: "No such macro",
+	overwriteWarning: "A tiddler named '%0' already exists. Choose OK to overwrite it",
+	unsavedChangesWarning: "WARNING! There are unsaved changes in TiddlyWiki\n\nChoose OK to save\nChoose CANCEL to discard",
+	confirmExit: "--------------------------------\n\nThere are unsaved changes in TiddlyWiki. If you continue you will lose those changes\n\n--------------------------------",
+	saveInstructions: "SaveChanges",
+	unsupportedTWFormat: "Unsupported TiddlyWiki format '%0'",
+	tiddlerSaveError: "Error when saving tiddler '%0'",
+	tiddlerLoadError: "Error when loading tiddler '%0'",
+	wrongSaveFormat: "Cannot save with storage format '%0'. Using standard format for save.",
+	invalidFieldName: "Invalid field name %0",
+	fieldCannotBeChanged: "Field '%0' cannot be changed",
+	loadingMissingTiddler: "Attempting to retrieve the tiddler '%0' from the '%1' server at:\n\n'%2' in the workspace '%3'"});
+
+merge(config.messages.messageClose,{
+	text: "close",
+	tooltip: "close this message area"});
+
+config.messages.backstage = {
+	open: {text: "backstage", tooltip: "Open the backstage area to perform authoring and editing tasks"},
+	close: {text: "close", tooltip: "Close the backstage area"},
+	prompt: "backstage: ",
+	decal: {
+		edit: {text: "edit", tooltip: "Edit the tiddler '%0'"}
+	}
+};
+
+config.messages.listView = {
+	tiddlerTooltip: "Click for the full text of this tiddler",
+	previewUnavailable: "(preview not available)"
+};
+
+config.messages.dates.months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November","December"];
+config.messages.dates.days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+config.messages.dates.shortMonths = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+config.messages.dates.shortDays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+// suffixes for dates, eg "1st","2nd","3rd"..."30th","31st"
+config.messages.dates.daySuffixes = ["st","nd","rd","th","th","th","th","th","th","th",
+		"th","th","th","th","th","th","th","th","th","th",
+		"st","nd","rd","th","th","th","th","th","th","th",
+		"st"];
+config.messages.dates.am = "am";
+config.messages.dates.pm = "pm";
+
+merge(config.messages.tiddlerPopup,{
+	});
+
+merge(config.views.wikified.tag,{
+	labelNoTags: "no tags",
+	labelTags: "tags: ",
+	openTag: "Open tag '%0'",
+	tooltip: "Show tiddlers tagged with '%0'",
+	openAllText: "Open all",
+	openAllTooltip: "Open all of these tiddlers",
+	popupNone: "No other tiddlers tagged with '%0'"});
+
+merge(config.views.wikified,{
+	defaultText: "The tiddler '%0' doesn't yet exist. Double-click to create it",
+	defaultModifier: "(missing)",
+	shadowModifier: "(built-in shadow tiddler)",
+	dateFormat: "DD MMM YYYY",
+	createdPrompt: "created"});
+
+merge(config.views.editor,{
+	tagPrompt: "Type tags separated with spaces, [[use double square brackets]] if necessary, or add existing",
+	defaultText: "Type the text for '%0'"});
+
+merge(config.views.editor.tagChooser,{
+	text: "tags",
+	tooltip: "Choose existing tags to add to this tiddler",
+	popupNone: "There are no tags defined",
+	tagTooltip: "Add the tag '%0'"});
+
+merge(config.messages,{
+	sizeTemplates:
+		[
+		{unit: 1024*1024*1024, template: "%0\u00a0GB"},
+		{unit: 1024*1024, template: "%0\u00a0MB"},
+		{unit: 1024, template: "%0\u00a0KB"},
+		{unit: 1, template: "%0\u00a0B"}
+		]});
+
+merge(config.macros.search,{
+	label: "search",
+	prompt: "Search this TiddlyWiki",
+	accessKey: "F",
+	successMsg: "%0 tiddlers found matching %1",
+	failureMsg: "No tiddlers found matching %0"});
+
+merge(config.macros.tagging,{
+	label: "tagging: ",
+	labelNotTag: "not tagging",
+	tooltip: "List of tiddlers tagged with '%0'"});
+
+merge(config.macros.timeline,{
+	dateFormat: "DD MMM YYYY"});
+
+merge(config.macros.allTags,{
+	tooltip: "Show tiddlers tagged with '%0'",
+	noTags: "There are no tagged tiddlers"});
+
+config.macros.list.all.prompt = "All tiddlers in alphabetical order";
+config.macros.list.missing.prompt = "Tiddlers that have links to them but are not defined";
+config.macros.list.orphans.prompt = "Tiddlers that are not linked to from any other tiddlers";
+config.macros.list.shadowed.prompt = "Tiddlers shadowed with default contents";
+config.macros.list.touched.prompt = "Tiddlers that have been modified locally";
+
+merge(config.macros.closeAll,{
+	label: "close all",
+	prompt: "Close all displayed tiddlers (except any that are being edited)"});
+
+merge(config.macros.permaview,{
+	label: "permaview",
+	prompt: "Link to an URL that retrieves all the currently displayed tiddlers"});
+
+merge(config.macros.saveChanges,{
+	label: "save changes",
+	prompt: "Save all tiddlers to create a new TiddlyWiki",
+	accessKey: "S"});
+
+merge(config.macros.newTiddler,{
+	label: "new tiddler",
+	prompt: "Create a new tiddler",
+	title: "New Tiddler",
+	accessKey: "N"});
+
+merge(config.macros.newJournal,{
+	label: "new journal",
+	prompt: "Create a new tiddler from the current date and time",
+	accessKey: "J"});
+
+merge(config.macros.options,{
+	wizardTitle: "Tweak advanced options",
+	step1Title: "These options are saved in cookies in your browser",
+	step1Html: "<input type='hidden' name='markList'></input><br><input type='checkbox' checked='false' name='chkUnknown'>Show unknown options</input>",
+	unknownDescription: "//(unknown)//",
+	listViewTemplate: {
+		columns: [
+			{name: 'Option', field: 'option', title: "Option", type: 'String'},
+			{name: 'Description', field: 'description', title: "Description", type: 'WikiText'},
+			{name: 'Name', field: 'name', title: "Name", type: 'String'}
+			],
+		rowClasses: [
+			{className: 'lowlight', field: 'lowlight'} 
+			]}
+	});
+
+merge(config.macros.plugins,{
+	wizardTitle: "Manage plugins",
+	step1Title: "Currently loaded plugins",
+	step1Html: "<input type='hidden' name='markList'></input>", // DO NOT TRANSLATE
+	skippedText: "(This plugin has not been executed because it was added since startup)",
+	noPluginText: "There are no plugins installed",
+	confirmDeleteText: "Are you sure you want to delete these plugins:\n\n%0",
+	removeLabel: "remove systemConfig tag",
+	removePrompt: "Remove systemConfig tag",
+	deleteLabel: "delete",
+	deletePrompt: "Delete these tiddlers forever",
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Size', field: 'size', tiddlerLink: 'size', title: "Size", type: 'Size'},
+			{name: 'Forced', field: 'forced', title: "Forced", tag: 'systemConfigForce', type: 'TagCheckbox'},
+			{name: 'Disabled', field: 'disabled', title: "Disabled", tag: 'systemConfigDisable', type: 'TagCheckbox'},
+			{name: 'Executed', field: 'executed', title: "Loaded", type: 'Boolean', trueText: "Yes", falseText: "No"},
+			{name: 'Startup Time', field: 'startupTime', title: "Startup Time", type: 'String'},
+			{name: 'Error', field: 'error', title: "Status", type: 'Boolean', trueText: "Error", falseText: "OK"},
+			{name: 'Log', field: 'log', title: "Log", type: 'StringList'}
+			],
+		rowClasses: [
+			{className: 'error', field: 'error'},
+			{className: 'warning', field: 'warning'}
+			]}
+	});
+
+merge(config.macros.toolbar,{
+	moreLabel: "more",
+	morePrompt: "Reveal further commands"
+	});
+
+merge(config.macros.refreshDisplay,{
+	label: "refresh",
+	prompt: "Redraw the entire TiddlyWiki display"
+	});
+
+merge(config.macros.importTiddlers,{
+	readOnlyWarning: "You cannot import into a read-only TiddlyWiki file. Try opening it from a file:// URL",
+	wizardTitle: "Import tiddlers from another file or server",
+	step1Title: "Step 1: Locate the server or TiddlyWiki file",
+	step1Html: "Specify the type of the server: <select name='selTypes'><option value=''>Choose...</option></select><br>Enter the URL or pathname here: <input type='text' size=50 name='txtPath'><br>...or browse for a file: <input type='file' size=50 name='txtBrowse'><br><hr>...or select a pre-defined feed: <select name='selFeeds'><option value=''>Choose...</option></select>",
+	openLabel: "open",
+	openPrompt: "Open the connection to this file or server",
+	openError: "There were problems fetching the tiddlywiki file",
+	statusOpenHost: "Opening the host",
+	statusGetWorkspaceList: "Getting the list of available workspaces",
+	step2Title: "Step 2: Choose the workspace",
+	step2Html: "Enter a workspace name: <input type='text' size=50 name='txtWorkspace'><br>...or select a workspace: <select name='selWorkspace'><option value=''>Choose...</option></select>",
+	cancelLabel: "cancel",
+	cancelPrompt: "Cancel this import",
+	statusOpenWorkspace: "Opening the workspace",
+	statusGetTiddlerList: "Getting the list of available tiddlers",
+	step3Title: "Step 3: Choose the tiddlers to import",
+	step3Html: "<input type='hidden' name='markList'></input><br><input type='checkbox' checked='true' name='chkSync'>Keep these tiddlers linked to this server so that you can synchronise subsequent changes</input><br><input type='checkbox' name='chkSave'>Save the details of this server in a 'systemServer' tiddler called:</input> <input type='text' size=25 name='txtSaveTiddler'>",
+	importLabel: "import",
+	importPrompt: "Import these tiddlers",
+	confirmOverwriteText: "Are you sure you want to overwrite these tiddlers:\n\n%0",
+	step4Title: "Step 4: Importing %0 tiddler(s)",
+	step4Html: "<input type='hidden' name='markReport'></input>", // DO NOT TRANSLATE
+	doneLabel: "done",
+	donePrompt: "Close this wizard",
+	statusDoingImport: "Importing tiddlers",
+	statusDoneImport: "All tiddlers imported",
+	systemServerNamePattern: "%2 on %1",
+	systemServerNamePatternNoWorkspace: "%1",
+	confirmOverwriteSaveTiddler: "The tiddler '%0' already exists. Click 'OK' to overwrite it with the details of this server, or 'Cancel' to leave it unchanged",
+	serverSaveTemplate: "|''Type:''|%0|\n|''URL:''|%1|\n|''Workspace:''|%2|\n\nThis tiddler was automatically created to record the details of this server",
+	serverSaveModifier: "(System)",
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Size', field: 'size', tiddlerLink: 'size', title: "Size", type: 'Size'},
+			{name: 'Tags', field: 'tags', title: "Tags", type: 'Tags'}
+			],
+		rowClasses: [
+			]}
+	});
+
+merge(config.macros.sync,{
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Server Type', field: 'serverType', title: "Server type", type: 'String'},
+			{name: 'Server Host', field: 'serverHost', title: "Server host", type: 'String'},
+			{name: 'Server Workspace', field: 'serverWorkspace', title: "Server workspace", type: 'String'},
+			{name: 'Status', field: 'status', title: "Synchronisation status", type: 'String'},
+			{name: 'Server URL', field: 'serverUrl', title: "Server URL", text: "View", type: 'Link'}
+			],
+		rowClasses: [
+			],
+		buttons: [
+			{caption: "Sync these tiddlers", name: 'sync'}
+			]},
+	wizardTitle: "Synchronize with external servers and files",
+	step1Title: "Choose the tiddlers you want to synchronize",
+	step1Html: "<input type='hidden' name='markList'></input>", // DO NOT TRANSLATE
+	syncLabel: "sync",
+	syncPrompt: "Sync these tiddlers",
+	hasChanged: "Changed while unplugged",
+	hasNotChanged: "Unchanged while unplugged",
+	syncStatusList: {
+		none: {text: "...", color: "none"},
+		changedServer: {text: "Changed on server", color: '#80ff80'},
+		changedLocally: {text: "Changed while unplugged", color: '#80ff80'},
+		changedBoth: {text: "Changed while unplugged and on server", color: '#ff8080'},
+		notFound: {text: "Not found on server", color: '#ffff80'},
+		putToServer: {text: "Saved update on server", color: '#ff80ff'},
+		gotFromServer: {text: "Retrieved update from server", color: '#80ffff'}
+		}
+	});
+
+merge(config.macros.annotations,{
+	});
+
+merge(config.commands.closeTiddler,{
+	text: "close",
+	tooltip: "Close this tiddler"});
+
+merge(config.commands.closeOthers,{
+	text: "close others",
+	tooltip: "Close all other tiddlers"});
+
+merge(config.commands.editTiddler,{
+	text: "edit",
+	tooltip: "Edit this tiddler",
+	readOnlyText: "view",
+	readOnlyTooltip: "View the source of this tiddler"});
+
+merge(config.commands.saveTiddler,{
+	text: "done",
+	tooltip: "Save changes to this tiddler"});
+
+merge(config.commands.cancelTiddler,{
+	text: "cancel",
+	tooltip: "Undo changes to this tiddler",
+	warning: "Are you sure you want to abandon your changes to '%0'?",
+	readOnlyText: "done",
+	readOnlyTooltip: "View this tiddler normally"});
+
+merge(config.commands.deleteTiddler,{
+	text: "delete",
+	tooltip: "Delete this tiddler",
+	warning: "Are you sure you want to delete '%0'?"});
+
+merge(config.commands.permalink,{
+	text: "permalink",
+	tooltip: "Permalink for this tiddler"});
+
+merge(config.commands.references,{
+	text: "references",
+	tooltip: "Show tiddlers that link to this one",
+	popupNone: "No references"});
+
+merge(config.commands.jump,{
+	text: "jump",
+	tooltip: "Jump to another open tiddler"});
+
+merge(config.commands.syncing,{
+	text: "syncing",
+	tooltip: "Control synchronisation of this tiddler with a server or external file",
+	currentlySyncing: "<div>Currently syncing via <span class='popupHighlight'>'%0'</span> to:</"+"div><div>host: <span class='popupHighlight'>%1</span></"+"div><div>workspace: <span class='popupHighlight'>%2</span></"+"div>", // Note escaping of closing <div> tag
+	notCurrentlySyncing: "Not currently syncing",
+	captionUnSync: "Stop synchronising this tiddler",
+	chooseServer: "Synchronise this tiddler with another server:",
+	currServerMarker: "\u25cf ",
+	notCurrServerMarker: "  "});
+
+merge(config.commands.fields,{
+	text: "fields",
+	tooltip: "Show the extended fields of this tiddler",
+	emptyText: "There are no extended fields for this tiddler",
+	listViewTemplate: {
+		columns: [
+			{name: 'Field', field: 'field', title: "Field", type: 'String'},
+			{name: 'Value', field: 'value', title: "Value", type: 'String'}
+			],
+		rowClasses: [
+			],
+		buttons: [
+			]}});
+
+merge(config.shadowTiddlers,{
+	DefaultTiddlers: "GettingStarted",
+	MainMenu: "GettingStarted",
+	SiteTitle: "My TiddlyWiki",
+	SiteSubtitle: "a reusable non-linear personal web notebook",
+	SiteUrl: "http://www.tiddlywiki.com/",
+	SideBarOptions: '<<search>><<closeAll>><<permaview>><<newTiddler>><<newJournal "DD MMM YYYY">><<saveChanges>><<slider chkSliderOptionsPanel OptionsPanel "options »" "Change TiddlyWiki advanced options">>',
+	SideBarTabs: '<<tabs txtMainTab "Timeline" "Timeline" TabTimeline "All" "All tiddlers" TabAll "Tags" "All tags" TabTags "More" "More lists" TabMore>>',
+	TabMore: '<<tabs txtMoreTab "Missing" "Missing tiddlers" TabMoreMissing "Orphans" "Orphaned tiddlers" TabMoreOrphans "Shadowed" "Shadowed tiddlers" TabMoreShadowed>>'});
+
+merge(config.annotations,{
+	AdvancedOptions: "This shadow tiddler provides access to several advanced options",
+	ColorPalette: "These values in this shadow tiddler determine the colour scheme of the ~TiddlyWiki user interface",
+	DefaultTiddlers: "The tiddlers listed in this shadow tiddler will be automatically displayed when ~TiddlyWiki starts up",
+	EditTemplate: "The HTML template in this shadow tiddler determines how tiddlers look while they are being edited",
+	GettingStarted: "This shadow tiddler provides basic usage instructions",
+	ImportTiddlers: "This shadow tiddler provides access to importing tiddlers",
+	MainMenu: "This shadow tiddler is used as the contents of the main menu in the left-hand column of the screen",
+	MarkupPreHead: "This tiddler is inserted at the top of the <head> section of the TiddlyWiki HTML file",
+	MarkupPostHead: "This tiddler is inserted at the bottom of the <head> section of the TiddlyWiki HTML file",
+	MarkupPreBody: "This tiddler is inserted at the top of the <body> section of the TiddlyWiki HTML file",
+	MarkupPostBody: "This tiddler is inserted at the end of the <body> section of the TiddlyWiki HTML file immediately before the script block",
+	OptionsPanel: "This shadow tiddler is used as the contents of the options panel slider in the right-hand sidebar",
+	PageTemplate: "The HTML template in this shadow tiddler determines the overall ~TiddlyWiki layout",
+	PluginManager: "This shadow tiddler provides access to the plugin manager",
+	SideBarOptions: "This shadow tiddler is used as the contents of the option panel in the right-hand sidebar",
+	SideBarTabs: "This shadow tiddler is used as the contents of the tabs panel in the right-hand sidebar",
+	SiteSubtitle: "This shadow tiddler is used as the second part of the page title",
+	SiteTitle: "This shadow tiddler is used as the first part of the page title",
+	SiteUrl: "This shadow tiddler should be set to the full target URL for publication",
+	StyleSheetColours: "This shadow tiddler contains CSS definitions related to the color of page elements",
+	StyleSheet: "This tiddler can contain custom CSS definitions",
+	StyleSheetLayout: "This shadow tiddler contains CSS definitions related to the layout of page elements",
+	StyleSheetLocale: "This shadow tiddler contains CSS definitions related to the translation locale",
+	StyleSheetPrint: "This shadow tiddler contains CSS definitions for printing",
+	TabAll: "This shadow tiddler contains the contents of the 'All' tab in the right-hand sidebar",
+	TabMore: "This shadow tiddler contains the contents of the 'More' tab in the right-hand sidebar",
+	TabMoreMissing: "This shadow tiddler contains the contents of the 'Missing' tab in the right-hand sidebar",
+	TabMoreOrphans: "This shadow tiddler contains the contents of the 'Orphans' tab in the right-hand sidebar",
+	TabMoreShadowed: "This shadow tiddler contains the contents of the 'Shadowed' tab in the right-hand sidebar",
+	TabTags: "This shadow tiddler contains the contents of the 'Tags' tab in the right-hand sidebar",
+	TabTimeline: "This shadow tiddler contains the contents of the 'Timeline' tab in the right-hand sidebar",
+	ViewTemplate: "The HTML template in this shadow tiddler determines how tiddlers look"
+	});
+
+//--
+//-- Main
+//--
+
+var params = null; // Command line parameters
+var store = null; // TiddlyWiki storage
+var story = null; // Main story
+var formatter = null; // Default formatters for the wikifier
+config.parsers = {}; // Hashmap of alternative parsers for the wikifier
+var anim = new Animator(); // Animation engine
+var readOnly = false; // Whether we're in readonly mode
+var highlightHack = null; // Embarrassing hack department...
+var hadConfirmExit = false; // Don't warn more than once
+var safeMode = false; // Disable all plugins and cookies
+var installedPlugins = []; // Information filled in when plugins are executed
+var startingUp = false; // Whether we're in the process of starting up
+var pluginInfo,tiddler; // Used to pass information to plugins in loadPlugins()
+
+// Whether to use the JavaSaver applet
+var useJavaSaver = config.browser.isSafari || config.browser.isOpera;
+
+// Starting up
+function main()
+{
+	var t9,t8,t7,t6,t5,t4,t3,t2,t1,t0 = new Date();
+	startingUp = true;
+	window.onbeforeunload = function(e) {if(window.confirmExit) return confirmExit();};
+	params = getParameters();
+	if(params)
+		params = params.parseParams("open",null,false);
+	store = new TiddlyWiki();
+	invokeParamifier(params,"oninit");
+	story = new Story("tiddlerDisplay","tiddler");
+	addEvent(document,"click",Popup.onDocumentClick);
+	saveTest();
+	loadOptionsCookie();
+	for(var s=0; s<config.notifyTiddlers.length; s++)
+		store.addNotification(config.notifyTiddlers[s].name,config.notifyTiddlers[s].notify);
+	t1 = new Date();
+	store.loadFromDiv("storeArea","store",true);
+	t2 = new Date();
+	loadShadowTiddlers();
+	t3 = new Date();
+	invokeParamifier(params,"onload");
+	t4 = new Date();
+	readOnly = (window.location.protocol == "file:") ? false : config.options.chkHttpReadOnly;
+	var pluginProblem = loadPlugins();
+	t5 = new Date();
+	formatter = new Formatter(config.formatters);
+	invokeParamifier(params,"onconfig");
+	t6 = new Date();
+	store.notifyAll();
+	t7 = new Date();
+	restart();
+	t8 = new Date();
+	if(pluginProblem) {
+		story.displayTiddler(null,"PluginManager");
+		displayMessage(config.messages.customConfigError);
+	}
+	for(var m in config.macros) {
+		if(config.macros[m].init)
+			config.macros[m].init();
+	}
+	if(!readOnly)
+		backstage.init();
+	t9 = new Date();
+	if(config.options.chkDisplayStartupTime) {
+		displayMessage("Load in " + (t2-t1) + " ms");
+		displayMessage("Loadshadows in " + (t3-t2) + " ms");
+		displayMessage("Loadplugins in " + (t5-t4) + " ms");
+		displayMessage("Notify in " + (t7-t6) + " ms");
+		displayMessage("Restart in " + (t8-t7) + " ms");
+		displayMessage("Total startup in " + (t9-t0) + " ms");
+	}
+	startingUp = false;
+}
+
+// Restarting
+function restart()
+{
+	invokeParamifier(params,"onstart");
+	if(story.isEmpty()) {
+		var defaultParams = store.getTiddlerText("DefaultTiddlers").parseParams("open",null,false);
+		invokeParamifier(defaultParams,"onstart");
+	}
+	window.scrollTo(0,0);
+}
+
+function saveTest()
+{
+	var s = document.getElementById("saveTest");
+	if(s.hasChildNodes())
+		alert(config.messages.savedSnapshotError);
+	s.appendChild(document.createTextNode("savetest"));
+}
+
+function loadShadowTiddlers()
+{
+	var shadows = new TiddlyWiki();
+	shadows.loadFromDiv("shadowArea","shadows",true);
+	shadows.forEachTiddler(function(title,tiddler){config.shadowTiddlers[title] = tiddler.text;});
+	delete shadows;
+}
+
+function loadPlugins()
+{
+	if(safeMode)
+		return false;
+	var tiddlers = store.getTaggedTiddlers("systemConfig");
+	var toLoad = [];
+	var nLoaded = 0;
+	var map = {};
+	var nPlugins = tiddlers.length;
+	installedPlugins = [];
+	for(var i=0; i<nPlugins; i++) {
+		var p = getPluginInfo(tiddlers[i]);
+		installedPlugins[i] = p;
+		var n = p.Name;
+		if(n) 
+			map[n] = p;
+		if(n = p.Source) 
+			map[n] = p;
+	}
+	var visit = function(p) {
+		if(!p || p.done)
+			return;
+		p.done = 1;
+		var reqs = p.Requires;
+		if(reqs) {
+			reqs = reqs.readBracketedList();
+			for(var i=0; i<reqs.length; i++)
+				visit(map[reqs[i]]);
+		}
+		toLoad.push(p);
+	};
+	for(i=0; i<nPlugins; i++) 
+		visit(installedPlugins[i]);	
+	for(i=0; i<toLoad.length; i++) {
+		p = toLoad[i];
+		pluginInfo = p;
+		tiddler = p.tiddler;
+		if(isPluginExecutable(p)) {
+			if(isPluginEnabled(p)) {
+				p.executed = true;
+				var startTime = new Date();
+				try {
+					if(tiddler.text)
+						window.eval(tiddler.text);
+					nLoaded++;
+				} catch(ex) {
+					p.log.push(config.messages.pluginError.format([exceptionText(ex)]));
+					p.error = true;
+				}
+				pluginInfo.startupTime = String((new Date()) - startTime) + "ms"; 
+			} else {
+				nPlugins--;
+			}
+		} else {
+			p.warning = true;
+		}
+	}
+	return nLoaded != nPlugins;
+}
+
+function getPluginInfo(tiddler)
+{
+	var p = store.getTiddlerSlices(tiddler.title,["Name","Description","Version","Requires","CoreVersion","Date","Source","Author","License","Browsers"]);
+	p.tiddler = tiddler;
+	p.title = tiddler.title;
+	p.log = [];
+	return p;
+}
+
+// Check that a particular plugin is valid for execution
+function isPluginExecutable(plugin)
+{
+	if(plugin.tiddler.isTagged("systemConfigForce"))
+		return verifyTail(plugin,true,config.messages.pluginForced);
+	if(plugin["CoreVersion"]) {
+		var coreVersion = plugin["CoreVersion"].split(".");
+		var w = parseInt(coreVersion[0]) - version.major;
+		if(w == 0 && coreVersion[1])
+			w = parseInt(coreVersion[1]) - version.minor;
+		if(w == 0 && coreVersion[2])
+		 	w = parseInt(coreVersion[2]) - version.revision;
+		if(w > 0)
+			return verifyTail(plugin,false,config.messages.pluginVersionError);
+		}
+	return true;
+}
+
+function isPluginEnabled(plugin)
+{
+	if(plugin.tiddler.isTagged("systemConfigDisable"))
+		return verifyTail(plugin,false,config.messages.pluginDisabled);
+	return true;
+}
+
+function verifyTail(plugin,result,message)
+{
+	plugin.log.push(message);
+	return result;
+}
+
+function invokeMacro(place,macro,params,wikifier,tiddler)
+{
+	try {
+		var m = config.macros[macro];
+		if(m && m.handler)
+			m.handler(place,macro,params.readMacroParams(),wikifier,params,tiddler);
+		else
+			createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,config.messages.missingMacro]));
+	} catch(ex) {
+		createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,ex.toString()]));
+	}
+}
+
+//--
+//-- Paramifiers
+//--
+
+function getParameters()
+{
+	var p = null;
+	if(window.location.hash) {
+		p = decodeURI(window.location.hash.substr(1));
+		if(config.browser.firefoxDate != null && config.browser.firefoxDate[1] < "20051111")
+			p = convertUTF8ToUnicode(p);
+	}
+	return p;
+}
+
+function invokeParamifier(params,handler)
+{
+	if(!params || params.length == undefined || params.length <= 1)
+		return;
+	for(var t=1; t<params.length; t++) {
+		var p = config.paramifiers[params[t].name];
+		if(p && p[handler] instanceof Function)
+			p[handler](params[t].value);
+	}
+}
+
+config.paramifiers = {};
+
+config.paramifiers.start = {
+	oninit: function(v) {
+		safeMode = v.toLowerCase() == "safe";
+	}
+};
+
+config.paramifiers.open = {
+	onstart: function(v) {
+		story.displayTiddler("bottom",v,null,false,null);
+	}
+};
+
+config.paramifiers.story = {
+	onstart: function(v) {
+		var list = store.getTiddlerText(v,"").parseParams("open",null,false);
+		invokeParamifier(list,"onstart");
+	}
+};
+
+config.paramifiers.search = {
+	onstart: function(v) {
+		story.search(v,false,false);
+	}
+};
+
+config.paramifiers.searchRegExp = {
+	onstart: function(v) {
+		story.prototype.search(v,false,true);
+	}
+};
+
+config.paramifiers.tag = {
+	onstart: function(v) {
+		var tagged = store.getTaggedTiddlers(v,"title");
+		for(var t=0; t<tagged.length; t++)
+			story.displayTiddler("bottom",tagged[t].title,null,false,null);
+	}
+};
+
+config.paramifiers.newTiddler = {
+	onstart: function(v) {
+		if(!readOnly) {
+			story.displayTiddler(null,v,DEFAULT_EDIT_TEMPLATE);
+			story.focusTiddler(v,"text");
+		}
+	}
+};
+
+config.paramifiers.newJournal = {
+	onstart: function(v) {
+		if(!readOnly) {
+			var now = new Date();
+			var title = now.formatString(v.trim());
+			story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE);
+			story.focusTiddler(title,"text");
+		}
+	}
+};
+
+config.paramifiers.readOnly = {
+	onconfig: function(v) {
+		var p = v.toLowerCase();
+		readOnly = p == "yes" ? true : (p == "no" ? false : readOnly);
+	}
+};
+
+//--
+//-- Formatter helpers
+//--
+
+function Formatter(formatters)
+{
+	this.formatters = [];
+	var pattern = [];
+	for(var n=0; n<formatters.length; n++) {
+		pattern.push("(" + formatters[n].match + ")");
+		this.formatters.push(formatters[n]);
+	}
+	this.formatterRegExp = new RegExp(pattern.join("|"),"mg");
+}
+
+config.formatterHelpers = {
+
+	createElementAndWikify: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,this.element),this.termRegExp);
+	},
+	
+	inlineCssHelper: function(w)
+	{
+		var styles = [];
+		config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			var s,v;
+			if(lookaheadMatch[1]) {
+				s = lookaheadMatch[1].unDash();
+				v = lookaheadMatch[2];
+			} else {
+				s = lookaheadMatch[3].unDash();
+				v = lookaheadMatch[4];
+			}
+			if (s=="bgcolor")
+				s = "backgroundColor";
+			styles.push({style: s, value: v});
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+			config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+		}
+		return styles;
+	},
+
+	applyCssHelper: function(e,styles)
+	{
+		for(var t=0; t< styles.length; t++) {
+			try {
+				e.style[styles[t].style] = styles[t].value;
+			} catch (ex) {
+			}
+		}
+	},
+
+	enclosedTextHelper: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var text = lookaheadMatch[1];
+			if(config.browser.isIE)
+				text = text.replace(/\n/g,"\r");
+			createTiddlyElement(w.output,this.element,null,null,text);
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+		}
+	},
+
+	isExternalLink: function(link)
+	{
+		if(store.tiddlerExists(link) || store.isShadowTiddler(link)) {
+			return false;
+		}
+		var urlRegExp = new RegExp(config.textPrimitives.urlPattern,"mg");
+		if(urlRegExp.exec(link)) {
+			return true;
+		}
+		if (link.indexOf(".")!=-1 || link.indexOf("\\")!=-1 || link.indexOf("/")!=-1){
+			return true;
+		}
+		return false;
+	}
+
+};
+
+//--
+//-- Standard formatters
+//--
+
+config.formatters = [
+{
+	name: "table",
+	match: "^\\|(?:[^\\n]*)\\|(?:[fhck]?)$",
+	lookaheadRegExp: /^\|([^\n]*)\|([fhck]?)$/mg,
+	rowTermRegExp: /(\|(?:[fhck]?)$\n?)/mg,
+	cellRegExp: /(?:\|([^\n\|]*)\|)|(\|[fhck]?$\n?)/mg,
+	cellTermRegExp: /((?:\x20*)\|)/mg,
+	rowTypes: {"c":"caption", "h":"thead", "":"tbody", "f":"tfoot"},
+
+	handler: function(w)
+	{
+		var table = createTiddlyElement(w.output,"table",null,"twtable");
+		var prevColumns = [];
+		var currRowType = null;
+		var rowContainer;
+		var rowCount = 0;
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			var nextRowType = lookaheadMatch[2];
+			if(nextRowType == "k") {
+				table.className = lookaheadMatch[1];
+				w.nextMatch += lookaheadMatch[0].length+1;
+			} else {
+				if(nextRowType != currRowType) {
+					rowContainer = createTiddlyElement(table,this.rowTypes[nextRowType]);
+					currRowType = nextRowType;
+				}
+				if(currRowType == "c") {
+					// Caption
+					w.nextMatch++;
+					if(rowContainer != table.firstChild)
+						table.insertBefore(rowContainer,table.firstChild);
+					rowContainer.setAttribute("align",rowCount == 0?"top":"bottom");
+					w.subWikifyTerm(rowContainer,this.rowTermRegExp);
+				} else {
+					this.rowHandler(w,createTiddlyElement(rowContainer,"tr",null,(rowCount&1)?"oddRow":"evenRow"),prevColumns);
+					rowCount++;
+				}
+			}
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		}
+	},
+	rowHandler: function(w,e,prevColumns)
+	{
+		var col = 0;
+		var colSpanCount = 1;
+		var prevCell = null;
+		this.cellRegExp.lastIndex = w.nextMatch;
+		var cellMatch = this.cellRegExp.exec(w.source);
+		while(cellMatch && cellMatch.index == w.nextMatch) {
+			if(cellMatch[1] == "~") {
+				// Rowspan
+				var last = prevColumns[col];
+				if(last) {
+					last.rowSpanCount++;
+					last.element.setAttribute("rowspan",last.rowSpanCount);
+					last.element.setAttribute("rowSpan",last.rowSpanCount); // Needed for IE
+					last.element.valign = "center";
+				}
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+			} else if(cellMatch[1] == ">") {
+				// Colspan
+				colSpanCount++;
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+			} else if(cellMatch[2]) {
+				// End of row
+				if(prevCell && colSpanCount > 1) {
+					prevCell.setAttribute("colspan",colSpanCount);
+					prevCell.setAttribute("colSpan",colSpanCount); // Needed for IE
+				}
+				w.nextMatch = this.cellRegExp.lastIndex;
+				break;
+			} else {
+				// Cell
+				w.nextMatch++;
+				var styles = config.formatterHelpers.inlineCssHelper(w);
+				var spaceLeft = false;
+				var chr = w.source.substr(w.nextMatch,1);
+				while(chr == " ") {
+					spaceLeft = true;
+					w.nextMatch++;
+					chr = w.source.substr(w.nextMatch,1);
+				}
+				var cell;
+				if(chr == "!") {
+					cell = createTiddlyElement(e,"th");
+					w.nextMatch++;
+				} else {
+					cell = createTiddlyElement(e,"td");
+				}
+				prevCell = cell;
+				prevColumns[col] = {rowSpanCount:1,element:cell};
+				if(colSpanCount > 1) {
+					cell.setAttribute("colspan",colSpanCount);
+					cell.setAttribute("colSpan",colSpanCount); // Needed for IE
+					colSpanCount = 1;
+				}
+				config.formatterHelpers.applyCssHelper(cell,styles);
+				w.subWikifyTerm(cell,this.cellTermRegExp);
+				if(w.matchText.substr(w.matchText.length-2,1) == " ") // spaceRight
+					cell.align = spaceLeft ? "center" : "left";
+				else if(spaceLeft)
+					cell.align = "right";
+				w.nextMatch--;
+			}
+			col++;
+			this.cellRegExp.lastIndex = w.nextMatch;
+			cellMatch = this.cellRegExp.exec(w.source);
+		}
+	}
+},
+
+{
+	name: "heading",
+	match: "^!{1,6}",
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,"h" + w.matchLength),this.termRegExp);
+	}
+},
+
+{
+	name: "list",
+	match: "^(?:[\\*#;:]+)",
+	lookaheadRegExp: /^(?:(?:(\*)|(#)|(;)|(:))+)/mg,
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		var stack = [w.output];
+		var currLevel = 0, currType = null;
+		var listLevel, listType, itemType;
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			if(lookaheadMatch[1]) {
+				listType = "ul";
+				itemType = "li";
+			} else if(lookaheadMatch[2]) {
+				listType = "ol";
+				itemType = "li";
+			} else if(lookaheadMatch[3]) {
+				listType = "dl";
+				itemType = "dt";
+			} else if(lookaheadMatch[4]) {
+				listType = "dl";
+				itemType = "dd";
+			}
+			listLevel = lookaheadMatch[0].length;
+			w.nextMatch += lookaheadMatch[0].length;
+			var t;
+			if(listLevel > currLevel) {
+				for(t=currLevel; t<listLevel; t++) {
+					var target = (currLevel == 0) ? stack[stack.length-1] : stack[stack.length-1].lastChild;
+					stack.push(createTiddlyElement(target,listType));
+				}
+			} else if(listLevel < currLevel) {
+				for(t=currLevel; t>listLevel; t--)
+					stack.pop();
+			} else if(listLevel == currLevel && listType != currType) {
+				stack.pop();
+				stack.push(createTiddlyElement(stack[stack.length-1].lastChild,listType));
+			}
+			currLevel = listLevel;
+			currType = listType;
+			var e = createTiddlyElement(stack[stack.length-1],itemType);
+			w.subWikifyTerm(e,this.termRegExp);
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		}
+	}
+},
+
+{
+	name: "quoteByBlock",
+	match: "^<<<\\n",
+	termRegExp: /(^<<<(\n|$))/mg,
+	element: "blockquote",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "quoteByLine",
+	match: "^>+",
+	lookaheadRegExp: /^>+/mg,
+	termRegExp: /(\n)/mg,
+	element: "blockquote",
+	handler: function(w)
+	{
+		var stack = [w.output];
+		var currLevel = 0;
+		var newLevel = w.matchLength;
+		var t;
+		do {
+			if(newLevel > currLevel) {
+				for(t=currLevel; t<newLevel; t++)
+					stack.push(createTiddlyElement(stack[stack.length-1],this.element));
+			} else if(newLevel < currLevel) {
+				for(t=currLevel; t>newLevel; t--)
+					stack.pop();
+			}
+			currLevel = newLevel;
+			w.subWikifyTerm(stack[stack.length-1],this.termRegExp);
+			createTiddlyElement(stack[stack.length-1],"br");
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+			var matched = lookaheadMatch && lookaheadMatch.index == w.nextMatch;
+			if(matched) {
+				newLevel = lookaheadMatch[0].length;
+				w.nextMatch += lookaheadMatch[0].length;
+			}
+		} while(matched);
+	}
+},
+
+{
+	name: "rule",
+	match: "^----+$\\n?",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"hr");
+	}
+},
+
+{
+	name: "monospacedByLine",
+	match: "^\\{\\{\\{\\n",
+	lookaheadRegExp: /^\{\{\{\n((?:^[^\n]*\n)+?)(^\}\}\}$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForCSS",
+	match: "^/\\*\\{\\{\\{\\*/\\n",
+	lookaheadRegExp: /\/\*\{\{\{\*\/\n*((?:^[^\n]*\n)+?)(\n*^\/\*\}\}\}\*\/$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForPlugin",
+	match: "^//\\{\\{\\{\\n",
+	lookaheadRegExp: /^\/\/\{\{\{\n\n*((?:^[^\n]*\n)+?)(\n*^\/\/\}\}\}$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForTemplate",
+	match: "^<!--\\{\\{\\{-->\\n",
+	lookaheadRegExp: /<!--\{\{\{-->\n*((?:^[^\n]*\n)+?)(\n*^<!--\}\}\}-->$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "wikifyCommentForPlugin",
+	match: "^/\\*\\*\\*\\n",
+	termRegExp: /(^\*\*\*\/\n)/mg,
+	handler: function(w)
+	{
+		w.subWikifyTerm(w.output,this.termRegExp);
+	}
+},
+
+{
+	name: "wikifyCommentForTemplate",
+	match: "^<!---\\n",
+	termRegExp: /(^--->\n)/mg,
+	handler: function(w) 
+	{
+		w.subWikifyTerm(w.output,this.termRegExp);
+	}
+},
+
+{
+	name: "macro",
+	match: "<<",
+	lookaheadRegExp: /<<([^>\s]+)(?:\s*)((?:[^>]|(?:>(?!>)))*)>>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart && lookaheadMatch[1]) {
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			invokeMacro(w.output,lookaheadMatch[1],lookaheadMatch[2],w,w.tiddler);
+		}
+	}
+},
+
+{
+	name: "prettyLink",
+	match: "\\[\\[",
+	lookaheadRegExp: /\[\[(.*?)(?:\|(~)?(.*?))?\]\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var e;
+			var text = lookaheadMatch[1];
+			if(lookaheadMatch[3]) {
+				// Pretty bracketted link
+				var link = lookaheadMatch[3];
+				e = (!lookaheadMatch[2] && config.formatterHelpers.isExternalLink(link)) ?
+						createExternalLink(w.output,link) : createTiddlyLink(w.output,link,false,null,w.isStatic,w.tiddler);
+			} else {
+				// Simple bracketted link
+				e = createTiddlyLink(w.output,text,false,null,w.isStatic,w.tiddler);
+			}
+			createTiddlyText(e,text);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "unWikiLink",
+	match: config.textPrimitives.unWikiLink+config.textPrimitives.wikiLink,
+	handler: function(w)
+	{
+		w.outputText(w.output,w.matchStart+1,w.nextMatch);
+	}
+},
+
+{
+	name: "wikiLink",
+	match: config.textPrimitives.wikiLink,
+	handler: function(w)
+	{
+		if(w.matchStart > 0) {
+			var preRegExp = new RegExp(config.textPrimitives.anyLetterStrict,"mg");
+			preRegExp.lastIndex = w.matchStart-1;
+			var preMatch = preRegExp.exec(w.source);
+			if(preMatch.index == w.matchStart-1) {
+				w.outputText(w.output,w.matchStart,w.nextMatch);
+				return;
+			}
+		}
+		if(w.autoLinkWikiWords == true || store.isShadowTiddler(w.matchText)) {
+			var link = createTiddlyLink(w.output,w.matchText,false,null,w.isStatic,w.tiddler);
+			w.outputText(link,w.matchStart,w.nextMatch);
+		} else {
+			w.outputText(w.output,w.matchStart,w.nextMatch);
+		}
+	}
+},
+
+{
+	name: "urlLink",
+	match: config.textPrimitives.urlPattern,
+	handler: function(w)
+	{
+		w.outputText(createExternalLink(w.output,w.matchText),w.matchStart,w.nextMatch);
+	}
+},
+
+{
+	name: "image",
+	match: "\\[[<>]?[Ii][Mm][Gg]\\[",
+	lookaheadRegExp: /\[([<]?)(>?)[Ii][Mm][Gg]\[(?:([^\|\]]+)\|)?([^\[\]\|]+)\](?:\[([^\]]*)\])?\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var e = w.output;
+			if(lookaheadMatch[5]) {
+				var link = lookaheadMatch[5];
+				e = config.formatterHelpers.isExternalLink(link) ? createExternalLink(w.output,link) : createTiddlyLink(w.output,link,false,null,w.isStatic,w.tiddler);
+				addClass(e,"imageLink");
+			}
+			var img = createTiddlyElement(e,"img");
+			if(lookaheadMatch[1])
+				img.align = "left";
+			else if(lookaheadMatch[2])
+				img.align = "right";
+			if(lookaheadMatch[3])
+				img.title = lookaheadMatch[3];
+			img.src = lookaheadMatch[4];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "html",
+	match: "<[Hh][Tt][Mm][Ll]>",
+	lookaheadRegExp: /<[Hh][Tt][Mm][Ll]>((?:.|\n)*?)<\/[Hh][Tt][Mm][Ll]>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"span").innerHTML = lookaheadMatch[1];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "commentByBlock",
+	match: "/%",
+	lookaheadRegExp: /\/%((?:.|\n)*?)%\//mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+	}
+},
+
+{
+	name: "boldByChar",
+	match: "''",
+	termRegExp: /('')/mg,
+	element: "strong",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "italicByChar",
+	match: "//",
+	termRegExp: /(\/\/)/mg,
+	element: "em",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "underlineByChar",
+	match: "__",
+	termRegExp: /(__)/mg,
+	element: "u",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "strikeByChar",
+	match: "--(?!\\s|$)",
+	termRegExp: /((?!\s)--|(?=\n\n))/mg,
+	element: "strike",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "superscriptByChar",
+	match: "\\^\\^",
+	termRegExp: /(\^\^)/mg,
+	element: "sup",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "subscriptByChar",
+	match: "~~",
+	termRegExp: /(~~)/mg,
+	element: "sub",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "monospacedByChar",
+	match: "\\{\\{\\{",
+	lookaheadRegExp: /\{\{\{((?:.|\n)*?)\}\}\}/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"code",null,null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "styleByChar",
+	match: "@@",
+	termRegExp: /(@@)/mg,
+	handler: function(w)
+	{
+		var e = createTiddlyElement(w.output,"span");
+		var styles = config.formatterHelpers.inlineCssHelper(w);
+		if(styles.length == 0)
+			e.className = "marked";
+		else
+			config.formatterHelpers.applyCssHelper(e,styles);
+		w.subWikifyTerm(e,this.termRegExp);
+	}
+},
+
+{
+	name: "lineBreak",
+	match: "\\n|<br ?/?>",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"br");
+	}
+},
+
+{
+	name: "rawText",
+	match: "\\\"{3}|<nowiki>",
+	lookaheadRegExp: /(?:\"{3}|<nowiki>)((?:.|\n)*?)(?:\"{3}|<\/nowiki>)/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"span",null,null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "mdash",
+	match: "--",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"span").innerHTML = "&mdash;";
+	}
+},
+
+{
+	name: "htmlEntitiesEncoding",
+	match: "(?:(?:&#?[a-zA-Z0-9]{2,8};|.)(?:&#?(?:x0*(?:3[0-6][0-9a-fA-F]|1D[c-fC-F][0-9a-fA-F]|20[d-fD-F][0-9a-fA-F]|FE2[0-9a-fA-F])|0*(?:76[89]|7[7-9][0-9]|8[0-7][0-9]|761[6-9]|76[2-7][0-9]|84[0-3][0-9]|844[0-7]|6505[6-9]|6506[0-9]|6507[0-1]));)+|&#?[a-zA-Z0-9]{2,8};)",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"span").innerHTML = w.matchText;
+	}
+},
+
+{
+	name: "customClasses",
+	match: "\\{\\{",
+	termRegExp: /(\}\}\})/mg,
+	lookaheadRegExp: /\{\{[\s]*([\w]+[\s\w]*)[\s]*\{(\n?)/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch) {
+			var e = createTiddlyElement(w.output,lookaheadMatch[2] == "\n" ? "div" : "span",null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			w.subWikifyTerm(e,this.termRegExp);
+		}
+	}
+}
+
+];
+
+//--
+//-- Wikifier
+//--
+
+function getParser(tiddler,format)
+{
+	if(tiddler) {
+		if(!format)
+			format = tiddler.fields["wikiformat"];
+		if(format) {
+			for(var i in config.parsers) {
+				if(format == config.parsers[i].format)
+					return config.parsers[i];
+			}
+		} else {
+			for(var i in config.parsers) {
+				if(tiddler.isTagged(config.parsers[i].formatTag))
+					return config.parsers[i];
+			}
+		}
+	}
+	return formatter;
+}
+
+function wikify(source,output,highlightRegExp,tiddler)
+{
+	if(source && source != "") {
+		var wikifier = new Wikifier(source,getParser(tiddler),highlightRegExp,tiddler);
+		wikifier.subWikifyUnterm(output);
+	}
+}
+
+function wikifyStatic(source,highlightRegExp,tiddler,format)
+{
+	var e = createTiddlyElement(document.body,"div");
+	e.style.display = "none";
+	var html = "";
+	if(source && source != "") {
+		var wikifier = new Wikifier(source,getParser(tiddler,format),highlightRegExp,tiddler);
+		wikifier.isStatic = true;
+		wikifier.subWikifyUnterm(e);
+		html = e.innerHTML;
+		removeNode(e);
+	}
+	return html;
+}
+
+function wikifyPlain(title,theStore,limit)
+{
+	if(!theStore)
+		theStore = store;
+	if(theStore.tiddlerExists(title) || theStore.isShadowTiddler(title)) {
+		return wikifyPlainText(theStore.getTiddlerText(title),limit,tiddler);
+	} else {
+		return "";
+	}
+}
+
+function wikifyPlainText(text,limit,tiddler)
+{
+	if(limit > 0)
+		text = text.substr(0,limit);
+	var wikifier = new Wikifier(text,formatter,null,tiddler);
+	return wikifier.wikifyPlain();
+}
+
+function highlightify(source,output,highlightRegExp,tiddler)
+{
+	if(source && source != "") {
+		var wikifier = new Wikifier(source,formatter,highlightRegExp,tiddler);
+		wikifier.outputText(output,0,source.length);
+	}
+}
+
+function Wikifier(source,formatter,highlightRegExp,tiddler)
+{
+	this.source = source;
+	this.output = null;
+	this.formatter = formatter;
+	this.nextMatch = 0;
+	this.autoLinkWikiWords = tiddler && tiddler.autoLinkWikiWords() == false ? false : true;
+	this.highlightRegExp = highlightRegExp;
+	this.highlightMatch = null;
+	this.isStatic = false;
+	if(highlightRegExp) {
+		highlightRegExp.lastIndex = 0;
+		this.highlightMatch = highlightRegExp.exec(source);
+	}
+	this.tiddler = tiddler;
+}
+
+Wikifier.prototype.wikifyPlain = function()
+{
+	var e = createTiddlyElement(document.body,"div");
+	this.subWikify(e);
+	var text = getPlainText(e);
+	removeNode(e);
+	return text;
+};
+
+Wikifier.prototype.subWikify = function(output,terminator)
+{
+	if(terminator)
+		this.subWikifyTerm(output,new RegExp("(" + terminator + ")","mg"));
+	else
+		this.subWikifyUnterm(output);
+};
+
+Wikifier.prototype.subWikifyUnterm = function(output)
+{
+	// subWikify() can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+	while(formatterMatch) {
+		// Output any text before the match
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		// Set the match parameters for the handler
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		for(var t=1; t<formatterMatch.length; t++) {
+			if(formatterMatch[t]) {
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+			}
+		}
+		formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+	}
+	if(this.nextMatch < this.source.length) {
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+	}
+	this.output = oldOutput;
+};
+
+Wikifier.prototype.subWikifyTerm = function(output,terminatorRegExp)
+{
+	// subWikify() can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	// Get the first matches for the formatter and terminator RegExps
+	terminatorRegExp.lastIndex = this.nextMatch;
+	var terminatorMatch = terminatorRegExp.exec(this.source);
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+	while(terminatorMatch || formatterMatch) {
+		if(terminatorMatch && (!formatterMatch || terminatorMatch.index <= formatterMatch.index)) {
+			if(terminatorMatch.index > this.nextMatch)
+				this.outputText(this.output,this.nextMatch,terminatorMatch.index);
+			this.matchText = terminatorMatch[1];
+			this.matchLength = terminatorMatch[1].length;
+			this.matchStart = terminatorMatch.index;
+			this.nextMatch = this.matchStart + this.matchLength;
+			this.output = oldOutput;
+			return;
+		}
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		for(var t=1; t<formatterMatch.length; t++) {
+			if(formatterMatch[t]) {
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+			}
+		}
+		terminatorRegExp.lastIndex = this.nextMatch;
+		terminatorMatch = terminatorRegExp.exec(this.source);
+		formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+	}
+	if(this.nextMatch < this.source.length) {
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+	}
+	this.output = oldOutput;
+};
+
+Wikifier.prototype.outputText = function(place,startPos,endPos)
+{
+	while(this.highlightMatch && (this.highlightRegExp.lastIndex > startPos) && (this.highlightMatch.index < endPos) && (startPos < endPos)) {
+		if(this.highlightMatch.index > startPos) {
+			createTiddlyText(place,this.source.substring(startPos,this.highlightMatch.index));
+			startPos = this.highlightMatch.index;
+		}
+		var highlightEnd = Math.min(this.highlightRegExp.lastIndex,endPos);
+		var theHighlight = createTiddlyElement(place,"span",null,"highlight",this.source.substring(startPos,highlightEnd));
+		startPos = highlightEnd;
+		if(startPos >= this.highlightRegExp.lastIndex)
+			this.highlightMatch = this.highlightRegExp.exec(this.source);
+	}
+	if(startPos < endPos) {
+		createTiddlyText(place,this.source.substring(startPos,endPos));
+	}
+};
+
+//--
+//-- Macro definitions
+//--
+
+config.macros.today.handler = function(place,macroName,params)
+{
+	var now = new Date();
+	var text;
+	if(params[0])
+		text = now.formatString(params[0].trim());
+	else
+		text = now.toLocaleString();
+	createTiddlyElement(place,"span",null,null,text);
+};
+
+config.macros.version.handler = function(place)
+{
+	createTiddlyElement(place,"span",null,null,version.major + "." + version.minor + "." + version.revision + (version.beta ? " (beta " + version.beta + ")" : ""));
+};
+
+config.macros.list.handler = function(place,macroName,params)
+{
+	var type = params[0] ? params[0] : "all";
+	var list = document.createElement("ul");
+	place.appendChild(list);
+	if(this[type].prompt)
+		createTiddlyElement(list,"li",null,"listTitle",this[type].prompt);
+	var results;
+	if(this[type].handler)
+		results = this[type].handler(params);
+	for(var t = 0; t < results.length; t++) {
+		var li = document.createElement("li");
+		list.appendChild(li);
+		createTiddlyLink(li,typeof results[t] == "string" ? results[t] : results[t].title,true);
+	}
+};
+
+config.macros.list.all.handler = function(params)
+{
+	return store.reverseLookup("tags","excludeLists",false,"title");
+};
+
+config.macros.list.missing.handler = function(params)
+{
+	return store.getMissingLinks();
+};
+
+config.macros.list.orphans.handler = function(params)
+{
+	return store.getOrphans();
+};
+
+config.macros.list.shadowed.handler = function(params)
+{
+	return store.getShadowed();
+};
+
+config.macros.list.touched.handler = function(params)
+{
+	return store.getTouched();
+};
+
+config.macros.allTags.handler = function(place,macroName,params)
+{
+	var tags = store.getTags(params[0]);
+	var ul = createTiddlyElement(place,"ul");
+	if(tags.length == 0)
+		createTiddlyElement(ul,"li",null,"listTitle",this.noTags);
+	for(var t=0; t<tags.length; t++) {
+		var title = tags[t][0];
+		var info = getTiddlyLinkInfo(title);
+		var li =createTiddlyElement(ul,"li");
+		var btn = createTiddlyButton(li,title + " (" + tags[t][1] + ")",this.tooltip.format([title]),onClickTag,info.classes);
+		btn.setAttribute("tag",title);
+		btn.setAttribute("refresh","link");
+		btn.setAttribute("tiddlyLink",title);
+	}
+};
+
+config.macros.timeline.handler = function(place,macroName,params)
+{
+	var field = params[0] ? params[0] : "modified";
+	var tiddlers = store.reverseLookup("tags","excludeLists",false,field);
+	var lastDay = "";
+	var last = params[1] ? tiddlers.length-Math.min(tiddlers.length,parseInt(params[1])) : 0;
+	for(var t=tiddlers.length-1; t>=last; t--) {
+		var tiddler = tiddlers[t];
+		var theDay = tiddler[field].convertToLocalYYYYMMDDHHMM().substr(0,8);
+		if(theDay != lastDay) {
+			var theDateList = document.createElement("ul");
+			place.appendChild(theDateList);
+			createTiddlyElement(theDateList,"li",null,"listTitle",tiddler[field].formatString(this.dateFormat));
+			lastDay = theDay;
+		}
+		var theDateListItem = createTiddlyElement(theDateList,"li",null,"listLink");
+		theDateListItem.appendChild(createTiddlyLink(place,tiddler.title,true));
+	}
+};
+
+config.macros.search.handler = function(place,macroName,params)
+{
+	var searchTimeout = null;
+	var btn = createTiddlyButton(place,this.label,this.prompt,this.onClick);
+	var txt = createTiddlyElement(place,"input",null,"txtOptionInput");
+	if(params[0])
+		txt.value = params[0];
+	txt.onkeyup = this.onKeyPress;
+	txt.onfocus = this.onFocus;
+	txt.setAttribute("size",this.sizeTextbox);
+	txt.setAttribute("accessKey",this.accessKey);
+	txt.setAttribute("autocomplete","off");
+	txt.setAttribute("lastSearchText","");
+	if(config.browser.isSafari) {
+		txt.setAttribute("type","search");
+		txt.setAttribute("results","5");
+	} else {
+		txt.setAttribute("type","text");
+	}
+};
+
+// Global because there's only ever one outstanding incremental search timer
+config.macros.search.timeout = null;
+
+config.macros.search.doSearch = function(txt)
+{
+	if(txt.value.length > 0) {
+		story.search(txt.value,config.options.chkCaseSensitiveSearch,config.options.chkRegExpSearch);
+		txt.setAttribute("lastSearchText",txt.value);
+	}
+};
+
+config.macros.search.onClick = function(e)
+{
+	config.macros.search.doSearch(this.nextSibling);
+	return false;
+};
+
+config.macros.search.onKeyPress = function(e)
+{
+	if(!e) var e = window.event;
+	switch(e.keyCode) {
+		case 13: // Ctrl-Enter
+		case 10: // Ctrl-Enter on IE PC
+			config.macros.search.doSearch(this);
+			break;
+		case 27: // Escape
+			this.value = "";
+			clearMessage();
+			break;
+	}
+	if(this.value.length > 2) {
+		if(this.value != this.getAttribute("lastSearchText")) {
+			if(config.macros.search.timeout)
+				clearTimeout(config.macros.search.timeout);
+			var txt = this;
+			config.macros.search.timeout = setTimeout(function() {config.macros.search.doSearch(txt);},500);
+		}
+	} else {
+		if(config.macros.search.timeout)
+			clearTimeout(config.macros.search.timeout);
+	}
+};
+
+config.macros.search.onFocus = function(e)
+{
+	this.select();
+};
+
+config.macros.tiddler.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("name",null,true,false,true);
+	var names = params[0]["name"];
+	var tiddlerName = names[0];
+	var className = names[1] ? names[1] : null;
+	var args = params[0]["with"];
+	var wrapper = createTiddlyElement(place,"span",null,className);
+	if(!args) {
+		wrapper.setAttribute("refresh","content");
+		wrapper.setAttribute("tiddler",tiddlerName);
+	}
+	var text = store.getTiddlerText(tiddlerName);
+	if(text) {
+		var stack = config.macros.tiddler.tiddlerStack;
+		if(stack.indexOf(tiddlerName) !== -1)
+			return;
+		stack.push(tiddlerName);
+		try {
+			var n = args ? Math.min(args.length,9) : 0;
+			for(var i=0; i<n; i++) {
+				var placeholderRE = new RegExp("\\$" + (i + 1),"mg");
+				text = text.replace(placeholderRE,args[i]);
+			}
+			config.macros.tiddler.renderText(wrapper,text,tiddlerName,params);
+		} finally {
+			stack.pop();
+		}
+	}
+};
+
+config.macros.tiddler.renderText = function(place,text,tiddlerName,params) 
+{
+	wikify(text,place,null,store.getTiddler(tiddlerName));
+};
+
+config.macros.tiddler.tiddlerStack = [];
+
+config.macros.tag.handler = function(place,macroName,params)
+{
+	createTagButton(place,params[0]);
+};
+
+config.macros.tags.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var theList = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title && store.tiddlerExists(title))
+		tiddler = store.getTiddler(title);
+	var sep = getParam(params,"sep"," ");
+	var lingo = config.views.wikified.tag;
+	var prompt = tiddler.tags.length == 0 ? lingo.labelNoTags : lingo.labelTags;
+	createTiddlyElement(theList,"li",null,"listTitle",prompt.format([tiddler.title]));
+	for(var t=0; t<tiddler.tags.length; t++) {
+		createTagButton(createTiddlyElement(theList,"li"),tiddler.tags[t],tiddler.title);
+		if(t<tiddler.tags.length-1)
+			createTiddlyText(theList,sep);
+	}
+};
+
+config.macros.tagging.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var theList = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title == "" && tiddler instanceof Tiddler)
+		title = tiddler.title;
+	var sep = getParam(params,"sep"," ");
+	theList.setAttribute("title",this.tooltip.format([title]));
+	var tagged = store.getTaggedTiddlers(title);
+	var prompt = tagged.length == 0 ? this.labelNotTag : this.label;
+	createTiddlyElement(theList,"li",null,"listTitle",prompt.format([title,tagged.length]));
+	for(var t=0; t<tagged.length; t++) {
+		createTiddlyLink(createTiddlyElement(theList,"li"),tagged[t].title,true);
+		if(t<tagged.length-1)
+			createTiddlyText(theList,sep);
+	}
+};
+
+config.macros.closeAll.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.closeAll.onClick = function(e)
+{
+	story.closeAllTiddlers();
+	return false;
+};
+
+config.macros.permaview.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.permaview.onClick = function(e)
+{
+	story.permaView();
+	return false;
+};
+
+config.macros.saveChanges.handler = function(place)
+{
+	if(!readOnly)
+		createTiddlyButton(place,this.label,this.prompt,this.onClick,null,null,this.accessKey);
+};
+
+config.macros.saveChanges.onClick = function(e)
+{
+	saveChanges();
+	return false;
+};
+
+config.macros.slider.onClickSlider = function(e)
+{
+	if(!e) var e = window.event;
+	var n = this.nextSibling;
+	var cookie = n.getAttribute("cookie");
+	var isOpen = n.style.display != "none";
+	if(config.options.chkAnimate && anim && typeof Slider == "function")
+		anim.startAnimating(new Slider(n,!isOpen,null,"none"));
+	else
+		n.style.display = isOpen ? "none" : "block";
+	config.options[cookie] = !isOpen;
+	saveOptionCookie(cookie);
+	return false;
+};
+
+config.macros.slider.createSlider = function(place,cookie,title,tooltip)
+{
+	var cookie = cookie ? cookie : "";
+	var btn = createTiddlyButton(place,title,tooltip,this.onClickSlider);
+	var panel = createTiddlyElement(null,"div",null,"sliderPanel");
+	panel.setAttribute("cookie",cookie);
+	panel.style.display = config.options[cookie] ? "block" : "none";
+	place.appendChild(panel);
+	return panel;
+};
+
+config.macros.slider.handler = function(place,macroName,params)
+{
+	var panel = this.createSlider(place,params[0],params[2],params[3]);
+	var text = store.getTiddlerText(params[1]);
+	panel.setAttribute("refresh","content");
+	panel.setAttribute("tiddler",params[1]);
+	if(text)
+		wikify(text,panel,null,store.getTiddler(params[1]));
+};
+
+config.macros.option.genericCreate = function(place,type,opt,className,desc)
+{
+	var typeInfo = config.macros.option.types[type];
+	var c = document.createElement(typeInfo.elementType);
+	if(typeInfo.typeValue)
+		c.setAttribute("type",typeInfo.typeValue);
+	c[typeInfo.eventName] = typeInfo.onChange;
+	c.setAttribute("option",opt);
+	if(className)
+		c.className = className;
+	else
+		c.className = typeInfo.className;
+	if(config.optionsDesc[opt])
+		c.setAttribute("title",config.optionsDesc[opt]);
+	place.appendChild(c);
+	if(desc != "no")
+		createTiddlyText(place,config.optionsDesc[opt] ? config.optionsDesc[opt] : opt);
+	c[typeInfo.valueField] = config.options[opt];
+	return c;
+};
+
+config.macros.option.genericOnChange = function(e)
+{
+	var opt = this.getAttribute("option");
+	if(opt) {
+		var optType = opt.substr(0,3);
+		var handler = config.macros.option.types[optType];
+		if (handler.elementType && handler.valueField)
+			config.macros.option.propagateOption(opt,handler.valueField,this[handler.valueField],handler.elementType);
+		}
+	return true;
+};
+
+config.macros.option.types = {
+	'txt': {
+		elementType: "input",
+		valueField: "value",
+		eventName: "onkeyup",
+		className: "txtOptionInput",
+		create: config.macros.option.genericCreate,
+		onChange: config.macros.option.genericOnChange
+	},
+	'chk': {
+		elementType: "input",
+		valueField: "checked",
+		eventName: "onclick",
+		className: "chkOptionInput",
+		typeValue: "checkbox",
+		create: config.macros.option.genericCreate,
+		onChange: config.macros.option.genericOnChange
+	}
+};
+
+config.macros.option.propagateOption = function(opt,valueField,value,elementType)
+{
+	config.options[opt] = value;
+	saveOptionCookie(opt);
+	var nodes = document.getElementsByTagName(elementType);
+	for(var t=0; t<nodes.length; t++) {
+		var optNode = nodes[t].getAttribute("option");
+		if(opt == optNode)
+			nodes[t][valueField] = value;
+		}
+};
+
+config.macros.option.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var opt = (params[1] && params[1].name == "anon") ? params[1].value : getParam(params,"name",null);
+	var className = (params[2] && params[2].name == "anon") ? params[2].value : getParam(params,"class",null);
+	var desc = getParam(params,"desc","no");
+	var type = opt.substr(0,3);
+	var h = config.macros.option.types[type];
+	if (h && h.create)
+		h.create(place,type,opt,className,desc);
+};
+
+config.macros.options.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var showUnknown = getParam(params,"showUnknown","no");
+	var wizard = new Wizard();
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var chkUnknown = wizard.getElement("chkUnknown");
+	chkUnknown.checked = showUnknown == "yes";
+	chkUnknown.onchange = this.onChangeUnknown;
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	wizard.setValue("listWrapper",listWrapper);
+	this.refreshOptions(listWrapper,showUnknown == "yes");
+};
+
+config.macros.options.refreshOptions = function(listWrapper,showUnknown)
+{	
+	var opts = [];
+	for(var n in config.options) {
+		var opt = {};
+		opt.option = "";
+		opt.name = n;
+		opt.lowlight = !config.optionsDesc[n];
+		opt.description = opt.lowlight ? this.unknownDescription : config.optionsDesc[n];
+		if(!opt.lowlight || showUnknown)
+			opts.push(opt);
+	}
+	opts.sort(function(a,b) {return a.name.substr(3) < b.name.substr(3) ? -1 : (a.name.substr(3) == b.name.substr(3) ? 0 : +1);});
+	var listview = ListView.create(listWrapper,opts,this.listViewTemplate);
+	for(n=0; n<opts.length; n++) {
+		var type = opts[n].name.substr(0,3);
+		var h = config.macros.option.types[type];
+		if (h && h.create) {
+			h.create(opts[n].colElements['option'],type,opts[n].name,null,"no");
+		}
+	}
+};
+
+config.macros.options.onChangeUnknown = function(e)
+{
+	var wizard = new Wizard(this);
+	var listWrapper = wizard.getValue("listWrapper");
+	removeChildren(listWrapper);
+	config.macros.options.refreshOptions(listWrapper,this.checked);
+	return false;
+};
+
+config.macros.newTiddler.createNewTiddlerButton = function(place,title,params,label,prompt,accessKey,newFocus,isJournal)
+{
+	var tags = [];
+	for(var t=1; t<params.length; t++) {
+		if((params[t].name == "anon" && t != 1) || (params[t].name == "tag"))
+			tags.push(params[t].value);
+	}
+	label = getParam(params,"label",label);
+	prompt = getParam(params,"prompt",prompt);
+	accessKey = getParam(params,"accessKey",accessKey);
+	newFocus = getParam(params,"focus",newFocus);
+	var customFields = getParam(params,"fields","");
+	if(!customFields && !store.isShadowTiddler(title))
+		customFields = String.encodeHashMap(config.defaultCustomFields);
+	var btn = createTiddlyButton(place,label,prompt,this.onClickNewTiddler,null,null,accessKey);
+	btn.setAttribute("newTitle",title);
+	btn.setAttribute("isJournal",isJournal ? "true" : "false");
+	if(tags.length > 0)
+		btn.setAttribute("params",tags.join("|"));
+	btn.setAttribute("newFocus",newFocus);
+	btn.setAttribute("newTemplate",getParam(params,"template",DEFAULT_EDIT_TEMPLATE));
+	if(customFields !== "")
+		btn.setAttribute("customFields",customFields);
+	var text = getParam(params,"text");
+	if(text !== undefined) 
+		btn.setAttribute("newText",text);
+	return btn;
+};
+
+config.macros.newTiddler.onClickNewTiddler = function()
+{
+	var title = this.getAttribute("newTitle");
+	if(this.getAttribute("isJournal") == "true") {
+		var now = new Date();
+		title = now.formatString(title.trim());
+	}
+	var params = this.getAttribute("params");
+	var tags = params ? params.split("|") : [];
+	var focus = this.getAttribute("newFocus");
+	var template = this.getAttribute("newTemplate");
+	var customFields = this.getAttribute("customFields");
+	story.displayTiddler(null,title,template,false,null,null);
+	var tiddlerElem = document.getElementById(story.idPrefix + title);
+	story.addCustomFields(tiddlerElem,customFields);
+	var text = this.getAttribute("newText");
+	if(typeof text == "string")
+		story.getTiddlerField(title,"text").value = text.format([title]);
+	for(var t=0;t<tags.length;t++)
+		story.setTiddlerTag(title,tags[t],+1);
+	story.focusTiddler(title,focus);
+	return false;
+};
+
+config.macros.newTiddler.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!readOnly) {
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : this.title;
+		title = getParam(params,"title",title);
+		this.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"title",false);
+	}
+};
+
+config.macros.newJournal.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!readOnly) {
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : "";
+		title = getParam(params,"title",title);
+		config.macros.newTiddler.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"text",true);
+	}
+};
+
+config.macros.sparkline.handler = function(place,macroName,params)
+{
+	var data = [];
+	var min = 0;
+	var max = 0;
+	for(var t=0; t<params.length; t++) {
+		var v = parseInt(params[t]);
+		if(v < min)
+			min = v;
+		if(v > max)
+			max = v;
+		data.push(v);
+	}
+	if(data.length < 1)
+		return;
+	var box = createTiddlyElement(place,"span",null,"sparkline",String.fromCharCode(160));
+	box.title = data.join(",");
+	var w = box.offsetWidth;
+	var h = box.offsetHeight;
+	box.style.paddingRight = (data.length * 2 - w) + "px";
+	box.style.position = "relative";
+	for(var d=0; d<data.length; d++) {
+		var tick = document.createElement("img");
+		tick.border = 0;
+		tick.className = "sparktick";
+		tick.style.position = "absolute";
+		tick.src = "data:image/gif,GIF89a%01%00%01%00%91%FF%00%FF%FF%FF%00%00%00%C0%C0%C0%00%00%00!%F9%04%01%00%00%02%00%2C%00%00%00%00%01%00%01%00%40%02%02T%01%00%3B";
+		tick.style.left = d*2 + "px";
+		tick.style.width = "2px";
+		var v = Math.floor(((data[d] - min)/(max-min)) * h);
+		tick.style.top = (h-v) + "px";
+		tick.style.height = v + "px";
+		box.appendChild(tick);
+	}
+};
+
+config.macros.tabs.handler = function(place,macroName,params)
+{
+	var cookie = params[0];
+	var numTabs = (params.length-1)/3;
+	var wrapper = createTiddlyElement(null,"div",null,cookie);
+	var tabset = createTiddlyElement(wrapper,"div",null,"tabset");
+	tabset.setAttribute("cookie",cookie);
+	var validTab = false;
+	for(var t=0; t<numTabs; t++) {
+		var label = params[t*3+1];
+		var prompt = params[t*3+2];
+		var content = params[t*3+3];
+		var tab = createTiddlyButton(tabset,label,prompt,this.onClickTab,"tab tabUnselected");
+		tab.setAttribute("tab",label);
+		tab.setAttribute("content",content);
+		tab.title = prompt;
+		if(config.options[cookie] == label)
+			validTab = true;
+	}
+	if(!validTab)
+		config.options[cookie] = params[1];
+	place.appendChild(wrapper);
+	this.switchTab(tabset,config.options[cookie]);
+};
+
+config.macros.tabs.onClickTab = function(e)
+{
+	config.macros.tabs.switchTab(this.parentNode,this.getAttribute("tab"));
+	return false;
+};
+
+config.macros.tabs.switchTab = function(tabset,tab)
+{
+	var cookie = tabset.getAttribute("cookie");
+	var theTab = null;
+	var nodes = tabset.childNodes;
+	for(var t=0; t<nodes.length; t++) {
+		if(nodes[t].getAttribute && nodes[t].getAttribute("tab") == tab) {
+			theTab = nodes[t];
+			theTab.className = "tab tabSelected";
+		} else {
+			nodes[t].className = "tab tabUnselected";
+		}
+	}
+	if(theTab) {
+		if(tabset.nextSibling && tabset.nextSibling.className == "tabContents")
+			removeNode(tabset.nextSibling);
+		var tabContent = createTiddlyElement(null,"div",null,"tabContents");
+		tabset.parentNode.insertBefore(tabContent,tabset.nextSibling);
+		var contentTitle = theTab.getAttribute("content");
+		wikify(store.getTiddlerText(contentTitle),tabContent,null,store.getTiddler(contentTitle));
+		if(cookie) {
+			config.options[cookie] = tab;
+			saveOptionCookie(cookie);
+		}
+	}
+};
+
+// <<gradient [[tiddler name]] vert|horiz rgb rgb rgb rgb... >>
+config.macros.gradient.handler = function(place,macroName,params,wikifier)
+{
+	var terminator = ">>";
+	var panel;
+	if(wikifier)
+		panel = createTiddlyElement(place,"div",null,"gradient");
+	else
+		panel = place;
+	panel.style.position = "relative";
+	panel.style.overflow = "hidden";
+	panel.style.zIndex = "0";
+	var t;
+	if(wikifier) {
+		var styles = config.formatterHelpers.inlineCssHelper(wikifier);
+		config.formatterHelpers.applyCssHelper(panel,styles);
+	}
+	var colours = [];
+	for(t=1; t<params.length; t++) {
+		var c = new RGB(params[t]);
+		if(c)
+			colours.push(c);
+	}
+	drawGradient(panel,params[0] != "vert",colours);
+	if(wikifier)
+		wikifier.subWikify(panel,terminator);
+	if(document.all) {
+		panel.style.height = "100%";
+		panel.style.width = "100%";
+	}
+};
+
+config.macros.message.handler = function(place,macroName,params)
+{
+	if(params[0]) {
+		var m = config;
+		var p = params[0].split(".");
+		for(var t=0; t<p.length; t++) {
+			if(p[t] in m)
+				m = m[p[t]];
+			else
+				break;
+		}
+		createTiddlyText(place,m.toString().format(params.splice(1)));
+	}
+};
+
+config.macros.view.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if((tiddler instanceof Tiddler) && params[0]) {
+		var value = store.getValue(tiddler,params[0]);
+		if(value != undefined) {
+			switch(params[1]) {
+				case undefined:
+					highlightify(value,place,highlightHack,tiddler);
+					break;
+				case "link":
+					createTiddlyLink(place,value,true);
+					break;
+				case "wikified":
+					wikify(value,place,highlightHack,tiddler);
+					break;
+				case "date":
+					value = Date.convertFromYYYYMMDDHHMM(value);
+					createTiddlyText(place,value.formatString(params[2] ? params[2] : config.views.wikified.dateFormat));
+					break;
+			}
+		}
+	}
+};
+
+config.macros.edit.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var field = params[0];
+	var rows = params[1];
+	if((tiddler instanceof Tiddler) && field) {
+		story.setDirty(tiddler.title,true);
+		if(field != "text" && !rows) {
+			var e = createTiddlyElement(null,"input");
+			if(tiddler.isReadOnly())
+				e.setAttribute("readOnly","readOnly");
+			e.setAttribute("edit",field);
+			e.setAttribute("type","text");
+			var v = store.getValue(tiddler,field);
+			if(!v) 
+				v = "";
+			e.value = v;
+			e.setAttribute("size","40");
+			e.setAttribute("autocomplete","off");
+			place.appendChild(e);
+		} else {
+			var wrapper1 = createTiddlyElement(null,"fieldset",null,"fieldsetFix");
+			var wrapper2 = createTiddlyElement(wrapper1,"div");
+			var e = createTiddlyElement(wrapper2,"textarea");
+			if(tiddler.isReadOnly())
+				e.setAttribute("readOnly","readOnly");
+			var v = store.getValue(tiddler,field);
+			if(!v) 
+				v = "";
+			e.value = v;
+			var rows = rows ? rows : 10;
+			var lines = v.match(/\n/mg);
+			var maxLines = Math.max(parseInt(config.options.txtMaxEditRows),5);
+			if(lines != null && lines.length > rows)
+				rows = lines.length + 5;
+			rows = Math.min(rows,maxLines);
+			e.setAttribute("rows",rows);
+			e.setAttribute("edit",field);
+			place.appendChild(wrapper1);
+		}
+	}
+};
+
+config.macros.tagChooser.onClick = function(e)
+{
+	if(!e) var e = window.event;
+	var lingo = config.views.editor.tagChooser;
+	var popup = Popup.create(this);
+	var tags = store.getTags();
+	if(tags.length == 0)
+		createTiddlyText(createTiddlyElement(popup,"li"),lingo.popupNone);
+	for(var t=0; t<tags.length; t++) {
+		var theTag = createTiddlyButton(createTiddlyElement(popup,"li"),tags[t][0],lingo.tagTooltip.format([tags[t][0]]),config.macros.tagChooser.onTagClick);
+		theTag.setAttribute("tag",tags[t][0]);
+		theTag.setAttribute("tiddler",this.getAttribute("tiddler"));
+	}
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+};
+
+config.macros.tagChooser.onTagClick = function(e)
+{
+	if(!e) var e = window.event;
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(!readOnly)
+		story.setTiddlerTag(title,tag,0);
+	return false;
+};
+
+config.macros.tagChooser.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(tiddler instanceof Tiddler) {
+		var title = tiddler.title;
+		var lingo = config.views.editor.tagChooser;
+		var btn = createTiddlyButton(place,lingo.text,lingo.tooltip,this.onClick);
+		btn.setAttribute("tiddler",title);
+	}
+};
+
+// Create a toolbar command button
+config.macros.toolbar.createCommand = function(place,commandName,tiddler,theClass)
+{
+	if(typeof commandName != "string") {
+		var c = null;
+		for(var t in config.commands) {
+			if(config.commands[t] == commandName)
+				c = t;
+		}
+		commandName = c;
+	}
+	if((tiddler instanceof Tiddler) && (typeof commandName == "string")) {
+		var command = config.commands[commandName];
+		if(command.isEnabled ? command.isEnabled(tiddler) : this.isCommandEnabled(command,tiddler)) {
+			var text = command.getText ? command.getText(tiddler) : this.getCommandText(command,tiddler);
+			var tooltip = command.getTooltip ? command.getTooltip(tiddler) : this.getCommandTooltip(command,tiddler);
+			var cmd;
+			switch(command.type) {
+				case "popup":
+					cmd = this.onClickPopup;
+					break;
+				case "command":
+				default:
+					cmd = this.onClickCommand;
+					break;
+			}
+			var btn = createTiddlyButton(null,text,tooltip,cmd);
+			btn.setAttribute("commandName",commandName);
+			btn.setAttribute("tiddler",tiddler.title);
+			if(theClass)
+				addClass(btn,theClass);
+			place.appendChild(btn);
+		}
+	}
+};
+
+config.macros.toolbar.isCommandEnabled = function(command,tiddler)
+{
+	var title = tiddler.title;
+	var ro = tiddler.isReadOnly();
+	var shadow = store.isShadowTiddler(title) && !store.tiddlerExists(title);
+	return (!ro || (ro && !command.hideReadOnly)) && !(shadow && command.hideShadow);
+};
+
+config.macros.toolbar.getCommandText = function(command,tiddler)
+{
+	return tiddler.isReadOnly() && command.readOnlyText ? command.readOnlyText : command.text;
+};
+
+config.macros.toolbar.getCommandTooltip = function(command,tiddler)
+{
+	return tiddler.isReadOnly() && command.readOnlyTooltip ? command.readOnlyTooltip : command.tooltip;
+};
+
+config.macros.toolbar.onClickCommand = function(e)
+{
+	if(!e) var e = window.event;
+	e.cancelBubble = true;
+	if (e.stopPropagation) e.stopPropagation();
+	var command = config.commands[this.getAttribute("commandName")];
+	return command.handler(e,this,this.getAttribute("tiddler"));
+};
+
+config.macros.toolbar.onClickPopup = function(e)
+{
+	if(!e) var e = window.event;
+	e.cancelBubble = true;
+	if (e.stopPropagation) e.stopPropagation();
+	var popup = Popup.create(this);
+	var command = config.commands[this.getAttribute("commandName")];
+	var title = this.getAttribute("tiddler");
+	var tiddler = store.fetchTiddler(title);
+	popup.setAttribute("tiddler",title);
+	command.handlePopup(popup,title);
+	Popup.show();
+	return false;
+};
+
+// Invoke the first command encountered from a given place that is tagged with a specified class
+config.macros.toolbar.invokeCommand = function(place,theClass,event)
+{
+	var children = place.getElementsByTagName("a");
+	for(var t=0; t<children.length; t++) {
+		var c = children[t];
+		if(hasClass(c,theClass) && c.getAttribute && c.getAttribute("commandName")) {
+			if(c.onclick instanceof Function)
+				c.onclick.call(c,event);
+			break;
+		}
+	}
+};
+
+config.macros.toolbar.onClickMore = function(e)
+{
+	var e = this.nextSibling;
+	e.style.display = "inline";
+	removeNode(this);
+	return false;
+};
+
+config.macros.toolbar.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	for(var t=0; t<params.length; t++) {
+		var c = params[t];
+		switch(c) {
+			case '>':
+				var btn = createTiddlyButton(place,this.moreLabel,this.morePrompt,config.macros.toolbar.onClickMore);
+				addClass(btn,"moreCommand");
+				var e = createTiddlyElement(place,"span",null,"moreCommand");
+				e.style.display = "none";
+				place = e;
+				break;
+			default:
+				var theClass = "";
+				switch(c.substr(0,1)) {
+					case "+":
+						theClass = "defaultCommand";
+						c = c.substr(1);
+						break;
+					case "-":
+						theClass = "cancelCommand";
+						c = c.substr(1);
+						break;
+				}
+				if(c in config.commands)
+					this.createCommand(place,c,tiddler,theClass);
+				break;
+		}
+	}
+};
+
+config.macros.refreshDisplay.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.refreshDisplay.onClick = function(e)
+{
+	refreshAll();
+	return false;
+};
+
+config.macros.annotations.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var title = tiddler ? tiddler.title : null;
+	var a = title ? config.annotations[title] : null;
+	if(!tiddler || !title || !a)
+		return;
+	var text = a.format([title]);
+	wikify(text,createTiddlyElement(place,"div",null,"annotation"),null,tiddler);
+};
+
+//--
+//-- Menu and toolbar commands
+//--
+
+config.commands.closeTiddler.handler = function(event,src,title)
+{
+	story.closeTiddler(title,true);
+	return false;
+};
+
+config.commands.closeOthers.handler = function(event,src,title)
+{
+	story.closeAllTiddlers(title);
+	return false;
+};
+
+config.commands.editTiddler.handler = function(event,src,title)
+{
+	clearMessage();
+	var tiddlerElem = document.getElementById(story.idPrefix + title);
+	var fields = tiddlerElem.getAttribute("tiddlyFields");
+	story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE,false,null,fields);
+	story.focusTiddler(title,"text");
+	return false;
+};
+
+config.commands.saveTiddler.handler = function(event,src,title)
+{
+	var newTitle = story.saveTiddler(title,event.shiftKey);
+	if(newTitle)
+		story.displayTiddler(null,newTitle);
+	return false;
+};
+
+config.commands.cancelTiddler.handler = function(event,src,title)
+{
+	if(story.hasChanges(title) && !readOnly) {
+		if(!confirm(this.warning.format([title])))
+			return false;
+	}
+	story.setDirty(title,false);
+	story.displayTiddler(null,title);
+	return false;
+};
+
+config.commands.deleteTiddler.handler = function(event,src,title)
+{
+	var deleteIt = true;
+	if (config.options.chkConfirmDelete)
+		deleteIt = confirm(this.warning.format([title]));
+	if (deleteIt) {
+		store.removeTiddler(title);
+		story.closeTiddler(title,true);
+		autoSaveChanges();
+	}
+	return false;
+};
+
+config.commands.permalink.handler = function(event,src,title)
+{
+	var t = encodeURIComponent(String.encodeTiddlyLink(title));
+	if(window.location.hash != t)
+		window.location.hash = t;
+	return false;
+};
+
+config.commands.references.handlePopup = function(popup,title)
+{
+	var references = store.getReferringTiddlers(title);
+	var c = false;
+	for(var r=0; r<references.length; r++) {
+		if(references[r].title != title && !references[r].isTagged("excludeLists")) {
+			createTiddlyLink(createTiddlyElement(popup,"li"),references[r].title,true);
+			c = true;
+		}
+	}
+	if(!c)
+		createTiddlyText(createTiddlyElement(popup,"li",null,"disabled"),this.popupNone);
+};
+
+config.commands.jump.handlePopup = function(popup,title)
+{
+	story.forEachTiddler(function(title,element) {
+		createTiddlyLink(createTiddlyElement(popup,"li"),title,true,null,false,null,true);
+		});
+};
+
+config.commands.syncing.handlePopup = function(popup,title)
+{
+	var tiddler = store.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	var serverType = tiddler.getServerType();
+	var serverHost = tiddler.fields['server.host'];
+	var serverWorkspace = tiddler.fields['server.workspace'];
+	if(!serverWorkspace)
+		serverWorkspace = "";
+	if(serverType) {
+		var e = createTiddlyElement(popup,"li",null,"popupMessage");
+		e.innerHTML = config.commands.syncing.currentlySyncing.format([serverType,serverHost,serverWorkspace]);
+	} else {
+		createTiddlyElement(popup,"li",null,"popupMessage",config.commands.syncing.notCurrentlySyncing);
+	}
+	if(serverType) {
+		createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+		var btn = createTiddlyButton(createTiddlyElement(popup,"li"),this.captionUnSync,null,config.commands.syncing.onChooseServer);
+		btn.setAttribute("tiddler",title);
+		btn.setAttribute("server.type","");
+	}
+	createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+	createTiddlyElement(popup,"li",null,"popupMessage",config.commands.syncing.chooseServer);
+	var feeds = store.getTaggedTiddlers("systemServer","title");
+	for(var t=0; t<feeds.length; t++) {
+		var f = feeds[t];
+		var feedServerType = store.getTiddlerSlice(f.title,"Type");
+		if(!feedServerType)
+			feedServerType = "file";
+		var feedServerHost = store.getTiddlerSlice(f.title,"URL");
+		if(!feedServerHost)
+			feedServerHost = "";
+		var feedServerWorkspace = store.getTiddlerSlice(f.title,"Workspace");
+		if(!feedServerWorkspace)
+			feedServerWorkspace = "";
+		var caption = f.title;
+		if(serverType == feedServerType && serverHost == feedServerHost && serverWorkspace == feedServerWorkspace) {
+			caption = config.commands.syncing.currServerMarker + caption;
+		} else {
+			caption = config.commands.syncing.notCurrServerMarker + caption;
+		}
+		btn = createTiddlyButton(createTiddlyElement(popup,"li"),caption,null,config.commands.syncing.onChooseServer);
+		btn.setAttribute("tiddler",title);
+		btn.setAttribute("server.type",feedServerType);
+		btn.setAttribute("server.host",feedServerHost);
+		btn.setAttribute("server.workspace",feedServerWorkspace);
+	}
+};
+
+config.commands.syncing.onChooseServer = function(e)
+{
+	var tiddler = this.getAttribute("tiddler");
+	var serverType = this.getAttribute("server.type");
+	if(serverType) {
+		store.addTiddlerFields(tiddler,{
+			'server.type': serverType,
+			'server.host': this.getAttribute("server.host"),
+			'server.workspace': this.getAttribute("server.workspace")
+			});
+	} else {
+		store.setValue(tiddler,'server',null);
+	}
+	return false;
+};
+
+config.commands.fields.handlePopup = function(popup,title)
+{
+	var tiddler = store.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	var fields = {};
+	store.forEachField(tiddler,function(tiddler,fieldName,value) {fields[fieldName] = value;},true);
+	var items = [];
+	for(var t in fields) {
+		items.push({field: t,value: fields[t]});
+	}
+	items.sort(function(a,b) {return a.field < b.field ? -1 : (a.field == b.field ? 0 : +1);});
+	if(items.length > 0)
+		ListView.create(popup,items,this.listViewTemplate);
+	else
+		createTiddlyElement(popup,"div",null,null,this.emptyText);
+};
+
+//--
+//-- Tiddler() object
+//--
+
+function Tiddler(title)
+{
+	this.title = title;
+	this.text = null;
+	this.modifier = null;
+	this.modified = new Date();
+	this.created = new Date();
+	this.links = [];
+	this.linksUpdated = false;
+	this.tags = [];
+	this.fields = {};
+	return this;
+}
+
+Tiddler.prototype.getLinks = function()
+{
+	if(this.linksUpdated==false)
+		this.changed();
+	return this.links;
+};
+
+// Returns the fields that are inherited in string field:"value" field2:"value2" format
+Tiddler.prototype.getInheritedFields = function()
+{
+	var f = {};
+	for(i in this.fields) {
+		if(i=="server.host" || i=="server.workspace" || i=="wikiformat"|| i=="server.type") {
+			f[i] = this.fields[i];
+		}
+	}
+	return String.encodeHashMap(f);
+};
+
+// Increment the changeCount of a tiddler
+Tiddler.prototype.incChangeCount = function()
+{
+	var c = this.fields['changecount'];
+	c = c ? parseInt(c) : 0;
+	this.fields['changecount'] = String(c+1);
+};
+
+// Clear the changeCount of a tiddler
+Tiddler.prototype.clearChangeCount = function()
+{
+	if(this.fields['changecount']) {
+		delete this.fields['changecount'];
+	}
+};
+
+// Returns true if the tiddler has been updated since the tiddler was created or downloaded
+Tiddler.prototype.isTouched = function()
+{
+	var changeCount = this.fields['changecount'];
+	if(changeCount === undefined)
+		changeCount = 0;
+	return changeCount > 0;
+};
+
+// Format the text for storage in an RSS item
+Tiddler.prototype.saveToRss = function(url)
+{
+	var s = [];
+	s.push("<item>");
+	s.push("<title" + ">" + this.title.htmlEncode() + "</title" + ">");
+	s.push("<description>" + wikifyStatic(this.text,null,this).htmlEncode() + "</description>");
+	for(var t=0; t<this.tags.length; t++)
+		s.push("<category>" + this.tags[t] + "</category>");
+	s.push("<link>" + url + "#" + encodeURIComponent(String.encodeTiddlyLink(this.title)) + "</link>");
+	s.push("<pubDate>" + this.modified.toGMTString() + "</pubDate>");
+	s.push("</item>");
+	return s.join("\n");
+};
+
+// Change the text and other attributes of a tiddler
+Tiddler.prototype.set = function(title,text,modifier,modified,tags,created,fields)
+{
+	this.assign(title,text,modifier,modified,tags,created,fields);
+	this.changed();
+	return this;
+};
+
+// Change the text and other attributes of a tiddler without triggered a tiddler.changed() call
+Tiddler.prototype.assign = function(title,text,modifier,modified,tags,created,fields)
+{
+	if(title != undefined)
+		this.title = title;
+	if(text != undefined)
+		this.text = text;
+	if(modifier != undefined)
+		this.modifier = modifier;
+	if(modified != undefined)
+		this.modified = modified;
+	if(created != undefined)
+		this.created = created;
+	if(fields != undefined)
+		this.fields = fields;
+	if(tags != undefined)
+		this.tags = (typeof tags == "string") ? tags.readBracketedList() : tags;
+	else if(this.tags == undefined)
+		this.tags = [];
+	return this;
+};
+
+// Get the tags for a tiddler as a string (space delimited, using [[brackets]] for tags containing spaces)
+Tiddler.prototype.getTags = function()
+{
+	return String.encodeTiddlyLinkList(this.tags);
+};
+
+// Test if a tiddler carries a tag
+Tiddler.prototype.isTagged = function(tag)
+{
+	return this.tags.indexOf(tag) != -1;
+};
+
+// Static method to convert "\n" to newlines, "\s" to "\"
+Tiddler.unescapeLineBreaks = function(text)
+{
+	return text ? text.unescapeLineBreaks() : "";
+};
+
+// Convert newlines to "\n", "\" to "\s"
+Tiddler.prototype.escapeLineBreaks = function()
+{
+	return this.text.escapeLineBreaks();
+};
+
+// Updates the secondary information (like links[] array) after a change to a tiddler
+Tiddler.prototype.changed = function()
+{
+	this.links = [];
+	var t = this.autoLinkWikiWords() ? 0 : 1;
+	var tiddlerLinkRegExp = t==0 ? config.textPrimitives.tiddlerAnyLinkRegExp : config.textPrimitives.tiddlerForcedLinkRegExp;
+	tiddlerLinkRegExp.lastIndex = 0;
+	var formatMatch = tiddlerLinkRegExp.exec(this.text);
+	while(formatMatch) {
+		var lastIndex = tiddlerLinkRegExp.lastIndex;
+		if(t==0 && formatMatch[1] && formatMatch[1] != this.title) {
+			// wikiWordLink
+			if(formatMatch.index > 0) {
+				var preRegExp = new RegExp(config.textPrimitives.unWikiLink+"|"+config.textPrimitives.anyLetter,"mg");
+				preRegExp.lastIndex = formatMatch.index-1;
+				var preMatch = preRegExp.exec(this.text);
+				if(preMatch.index != formatMatch.index-1)
+					this.links.pushUnique(formatMatch[1]);
+			} else {
+				this.links.pushUnique(formatMatch[1]);
+			}
+		}
+		else if(formatMatch[2-t] && !config.formatterHelpers.isExternalLink(formatMatch[3-t])) // titledBrackettedLink
+			this.links.pushUnique(formatMatch[3-t]);
+		else if(formatMatch[4-t] && formatMatch[4-t] != this.title) // brackettedLink
+			this.links.pushUnique(formatMatch[4-t]);
+		tiddlerLinkRegExp.lastIndex = lastIndex;
+		formatMatch = tiddlerLinkRegExp.exec(this.text);
+	}
+	this.linksUpdated = true;
+};
+
+Tiddler.prototype.getSubtitle = function()
+{
+	var theModifier = this.modifier;
+	if(!theModifier)
+		theModifier = config.messages.subtitleUnknown;
+	var theModified = this.modified;
+	if(theModified)
+		theModified = theModified.toLocaleString();
+	else
+		theModified = config.messages.subtitleUnknown;
+	return config.messages.tiddlerLinkTooltip.format([this.title,theModifier,theModified]);
+};
+
+Tiddler.prototype.isReadOnly = function()
+{
+	return readOnly;
+};
+
+Tiddler.prototype.autoLinkWikiWords = function()
+{
+	return !(this.isTagged("systemConfig") || this.isTagged("excludeMissing"));
+};
+
+Tiddler.prototype.generateFingerprint = function()
+{
+	return "0x" + Crypto.hexSha1Str(this.text);
+};
+
+Tiddler.prototype.getServerType = function()
+{
+	var serverType = null;
+	if(this.fields && this.fields['server.type'])
+		serverType = this.fields['server.type'];
+	if(!serverType)
+		serverType = this.fields['wikiformat'];
+	if(serverType && !config.adaptors[serverType])
+		serverType = null;
+	return serverType;
+};
+
+Tiddler.prototype.getAdaptor = function()
+{
+	var serverType = this.getServerType();
+	if(serverType)
+		return new config.adaptors[serverType];
+	else
+		return null;
+};
+
+//--
+//-- TiddlyWiki() object contains Tiddler()s
+//--
+
+function TiddlyWiki()
+{
+	var tiddlers = {}; // Hashmap by name of tiddlers
+	this.tiddlersUpdated = false;
+	this.namedNotifications = []; // Array of {name:,notify:} of notification functions
+	this.notificationLevel = 0;
+	this.slices = {}; // map tiddlerName->(map sliceName->sliceValue). Lazy.
+	this.clear = function() {
+		tiddlers = {};
+		this.setDirty(false);
+	};
+	this.fetchTiddler = function(title) {
+		return tiddlers[title];
+	};
+	this.deleteTiddler = function(title) {
+		delete this.slices[title];
+		delete tiddlers[title];
+	};
+	this.addTiddler = function(tiddler) {
+		delete this.slices[tiddler.title];
+		tiddlers[tiddler.title] = tiddler;
+	};
+	this.forEachTiddler = function(callback) {
+		for(var t in tiddlers) {
+			var tiddler = tiddlers[t];
+			if(tiddler instanceof Tiddler)
+				callback.call(this,t,tiddler);
+		}
+	};
+}
+
+TiddlyWiki.prototype.setDirty = function(dirty)
+{
+	this.dirty = dirty;
+};
+
+TiddlyWiki.prototype.isDirty = function()
+{
+	return this.dirty;
+};
+
+TiddlyWiki.prototype.suspendNotifications = function()
+{
+	this.notificationLevel--;
+};
+
+TiddlyWiki.prototype.resumeNotifications = function()
+{
+	this.notificationLevel++;
+};
+
+// Invoke the notification handlers for a particular tiddler
+TiddlyWiki.prototype.notify = function(title,doBlanket)
+{
+	if(!this.notificationLevel) {
+		for(var t=0; t<this.namedNotifications.length; t++) {
+			var n = this.namedNotifications[t];
+			if((n.name == null && doBlanket) || (n.name == title))
+				n.notify(title);
+		}
+	}
+};
+
+// Invoke the notification handlers for all tiddlers
+TiddlyWiki.prototype.notifyAll = function()
+{
+	if(!this.notificationLevel) {
+		for(var t=0; t<this.namedNotifications.length; t++) {
+			var n = this.namedNotifications[t];
+			if(n.name)
+				n.notify(n.name);
+		}
+	}
+};
+
+// Add a notification handler to a tiddler
+TiddlyWiki.prototype.addNotification = function(title,fn)
+{
+	for(var i=0; i<this.namedNotifications.length; i++) {
+		if((this.namedNotifications[i].name == title) && (this.namedNotifications[i].notify == fn))
+			return this;
+	}
+	this.namedNotifications.push({name: title, notify: fn});
+	return this;
+};
+
+TiddlyWiki.prototype.removeTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		this.deleteTiddler(title);
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.tiddlerExists = function(title)
+{
+	var t = this.fetchTiddler(title);
+	return t != undefined;
+};
+
+TiddlyWiki.prototype.isShadowTiddler = function(title)
+{
+	return typeof config.shadowTiddlers[title] == "string";
+};
+
+TiddlyWiki.prototype.getTiddler = function(title)
+{
+	var t = this.fetchTiddler(title);
+	if(t != undefined)
+		return t;
+	else
+		return null;
+};
+
+TiddlyWiki.prototype.getTiddlerText = function(title,defaultText)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		return tiddler.text;
+	if(!title)
+		return defaultText;
+	var pos = title.indexOf(config.textPrimitives.sliceSeparator);
+	if(pos != -1) {
+		var slice = this.getTiddlerSlice(title.substr(0,pos),title.substr(pos + config.textPrimitives.sliceSeparator.length));
+		if(slice)
+			return slice;
+	}
+	if(this.isShadowTiddler(title))
+		return config.shadowTiddlers[title];
+	if(defaultText != undefined)
+		return defaultText;
+	return null;
+};
+
+TiddlyWiki.prototype.slicesRE = /(?:[\'\/]*~?([\.\w]+)[\'\/]*\:[\'\/]*\s*(.*?)\s*$)|(?:\|[\'\/]*~?([\.\w]+)\:?[\'\/]*\|\s*(.*?)\s*\|)/gm;
+
+// @internal
+TiddlyWiki.prototype.calcAllSlices = function(title)
+{
+	var slices = {};
+	var text = this.getTiddlerText(title,"");
+	this.slicesRE.lastIndex = 0;
+	do {
+		var m = this.slicesRE.exec(text);
+		if(m) {
+			if(m[1])
+				slices[m[1]] = m[2];
+			else
+				slices[m[3]] = m[4];
+		}
+	} while(m);
+	return slices;
+};
+
+// Returns the slice of text of the given name
+TiddlyWiki.prototype.getTiddlerSlice = function(title,sliceName)
+{
+	var slices = this.slices[title];
+	if(!slices) {
+		slices = this.calcAllSlices(title);
+		this.slices[title] = slices;
+	}
+	return slices[sliceName];
+};
+
+// Build an hashmap of the specified named slices of a tiddler
+TiddlyWiki.prototype.getTiddlerSlices = function(title,sliceNames)
+{
+	var r = {};
+	for(var t=0; t<sliceNames.length; t++) {
+		var slice = this.getTiddlerSlice(title,sliceNames[t]);
+		if(slice)
+			r[sliceNames[t]] = slice;
+	}
+	return r;
+};
+
+TiddlyWiki.prototype.getRecursiveTiddlerText = function(title,defaultText,depth)
+{
+	var bracketRegExp = new RegExp("(?:\\[\\[([^\\]]+)\\]\\])","mg");
+	var text = this.getTiddlerText(title,null);
+	if(text == null)
+		return defaultText;
+	var textOut = [];
+	var lastPos = 0;
+	do {
+		var match = bracketRegExp.exec(text);
+		if(match) {
+			textOut.push(text.substr(lastPos,match.index-lastPos));
+			if(match[1]) {
+				if(depth <= 0)
+					textOut.push(match[1]);
+				else
+					textOut.push(this.getRecursiveTiddlerText(match[1],"[[" + match[1] + "]]",depth-1));
+			}
+			lastPos = match.index + match[0].length;
+		} else {
+			textOut.push(text.substr(lastPos));
+		}
+	} while(match);
+	return textOut.join("");
+};
+
+TiddlyWiki.prototype.setTiddlerTag = function(title,status,tag)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		var t = tiddler.tags.indexOf(tag);
+		if(t != -1)
+			tiddler.tags.splice(t,1);
+		if(status)
+			tiddler.tags.push(tag);
+		tiddler.changed();
+		this.incChangeCount(title);
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.addTiddlerFields = function(title,fields)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	merge(tiddler.fields,fields);
+	tiddler.changed();
+	this.incChangeCount(title);
+	this.notify(title,true);
+	this.setDirty(true);
+};
+
+TiddlyWiki.prototype.saveTiddler = function(title,newTitle,newBody,modifier,modified,tags,fields,clearChangeCount,created)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		created = created ? created : tiddler.created; // Preserve created date
+		this.deleteTiddler(title);
+	} else {
+		created = created ? created : modified;
+		tiddler = new Tiddler();
+	}
+	tiddler.set(newTitle,newBody,modifier,modified,tags,created,fields);
+	this.addTiddler(tiddler);
+	if(clearChangeCount)
+		tiddler.clearChangeCount();
+	else
+		tiddler.incChangeCount();
+	if(title != newTitle)
+		this.notify(title,true);
+	this.notify(newTitle,true);
+	this.setDirty(true);
+	return tiddler;
+};
+
+// Reset the sync status of a freshly synced tiddler
+TiddlyWiki.prototype.resetTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		tiddler.clearChangeCount();
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.incChangeCount = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		tiddler.incChangeCount();
+};
+
+TiddlyWiki.prototype.createTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(!tiddler) {
+		tiddler = new Tiddler();
+		tiddler.title = title;
+		this.addTiddler(tiddler);
+		this.setDirty(true);
+	}
+	return tiddler;
+};
+
+// Load contents of a TiddlyWiki from an HTML DIV
+TiddlyWiki.prototype.loadFromDiv = function(src,idPrefix,noUpdate)
+{
+	this.idPrefix = idPrefix;
+	var storeElem = (typeof src == "string") ? document.getElementById(src) : src;
+	if(!storeElem)
+		return;
+	var tiddlers = this.getLoader().loadTiddlers(this,storeElem.childNodes);
+	this.setDirty(false);
+	if(!noUpdate) {
+		for(var i = 0;i<tiddlers.length; i++)
+			tiddlers[i].changed();
+	}
+};
+
+// Load contents of a TiddlyWiki from a string
+// Returns null if there's an error
+TiddlyWiki.prototype.importTiddlyWiki = function(text)
+{
+	var posDiv = locateStoreArea(text);
+	if(!posDiv)
+		return null;
+	var content = "<" + "html><" + "body>" + text.substring(posDiv[0],posDiv[1] + endSaveArea.length) + "<" + "/body><" + "/html>";
+	// Create the iframe
+	var iframe = document.createElement("iframe");
+	iframe.style.display = "none";
+	document.body.appendChild(iframe);
+	var doc = iframe.document;
+	if(iframe.contentDocument)
+		doc = iframe.contentDocument; // For NS6
+	else if(iframe.contentWindow)
+		doc = iframe.contentWindow.document; // For IE5.5 and IE6
+	// Put the content in the iframe
+	doc.open();
+	doc.writeln(content);
+	doc.close();
+	// Load the content into a TiddlyWiki() object
+	var storeArea = doc.getElementById("storeArea");
+	this.loadFromDiv(storeArea,"store");
+	// Get rid of the iframe
+	iframe.parentNode.removeChild(iframe);
+	return this;
+};
+
+TiddlyWiki.prototype.updateTiddlers = function()
+{
+	this.tiddlersUpdated = true;
+	this.forEachTiddler(function(title,tiddler) {
+		tiddler.changed();
+	});
+};
+
+// Return all tiddlers formatted as an HTML string
+TiddlyWiki.prototype.allTiddlersAsHtml = function()
+{
+	return store.getSaver().externalize(store);
+};
+
+// Return an array of tiddlers matching a search regular expression
+TiddlyWiki.prototype.search = function(searchRegExp,sortField,excludeTag)
+{
+	var candidates = this.reverseLookup("tags",excludeTag,false);
+	var results = [];
+	for(var t=0; t<candidates.length; t++) {
+		if((candidates[t].title.search(searchRegExp) != -1) || (candidates[t].text.search(searchRegExp) != -1))
+			results.push(candidates[t]);
+	}
+	if(!sortField)
+		sortField = "title";
+	results.sort(function(a,b) {return a[sortField] < b[sortField] ? -1 : (a[sortField] == b[sortField] ? 0 : +1);});
+	return results;
+};
+
+// Return an array of all the tags in use. Each member of the array is another array where [0] is the name of the tag and [1] is the number of occurances
+TiddlyWiki.prototype.getTags = function(excludeTag)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		for(var g=0; g<tiddler.tags.length; g++) {
+			var tag = tiddler.tags[g];
+			if(excludeTag) {
+				var t = store.fetchTiddler(tag);
+				if(t && t.isTagged(excludeTag))
+					return false;
+			}
+			var f = false;
+			for(var c=0; c<results.length; c++) {
+				if(results[c][0] == tag) {
+					f = true;
+					results[c][1]++;
+				}
+			}
+			if(!f)
+				results.push([tag,1]);
+		}
+	});
+	results.sort(function(a,b) {return a[0].toLowerCase() < b[0].toLowerCase() ? -1 : (a[0].toLowerCase() == b[0].toLowerCase() ? 0 : +1);});
+	return results;
+};
+
+// Return an array of the tiddlers that are tagged with a given tag
+TiddlyWiki.prototype.getTaggedTiddlers = function(tag,sortField)
+{
+	return this.reverseLookup("tags",tag,true,sortField);
+};
+
+// Return an array of the tiddlers that link to a given tiddler
+TiddlyWiki.prototype.getReferringTiddlers = function(title,unusedParameter,sortField)
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	return this.reverseLookup("links",title,true,sortField);
+};
+
+// Return an array of the tiddlers that do or do not have a specified entry in the specified storage array (ie, "links" or "tags")
+// lookupMatch == true to match tiddlers, false to exclude tiddlers
+TiddlyWiki.prototype.reverseLookup = function(lookupField,lookupValue,lookupMatch,sortField)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		var f = !lookupMatch;
+		for(var lookup=0; lookup<tiddler[lookupField].length; lookup++) {
+			if(tiddler[lookupField][lookup] == lookupValue)
+				f = lookupMatch;
+		}
+		if(f)
+			results.push(tiddler);
+	});
+	if(!sortField)
+		sortField = "title";
+	results.sort(function(a,b) {return a[sortField] < b[sortField] ? -1 : (a[sortField] == b[sortField] ? 0 : +1);});
+	return results;
+};
+
+// Return the tiddlers as a sorted array
+TiddlyWiki.prototype.getTiddlers = function(field,excludeTag)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		if(excludeTag == undefined || !tiddler.isTagged(excludeTag))
+			results.push(tiddler);
+	});
+	if(field)
+		results.sort(function(a,b) {return a[field] < b[field] ? -1 : (a[field] == b[field] ? 0 : +1);});
+	return results;
+};
+
+// Return array of names of tiddlers that are referred to but not defined
+TiddlyWiki.prototype.getMissingLinks = function(sortField)
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		if(tiddler.isTagged("excludeMissing") || tiddler.isTagged("systemConfig"))
+			return;
+		for(var n=0; n<tiddler.links.length;n++) {
+			var link = tiddler.links[n];
+			if(this.fetchTiddler(link) == null && !this.isShadowTiddler(link))
+				results.pushUnique(link);
+		}
+	});
+	results.sort();
+	return results;
+};
+
+// Return an array of names of tiddlers that are defined but not referred to
+TiddlyWiki.prototype.getOrphans = function()
+{
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		if(this.getReferringTiddlers(title).length == 0 && !tiddler.isTagged("excludeLists"))
+			results.push(title);
+	});
+	results.sort();
+	return results;
+};
+
+// Return an array of names of all the shadow tiddlers
+TiddlyWiki.prototype.getShadowed = function()
+{
+	var results = [];
+	for(var t in config.shadowTiddlers) {
+		if(typeof config.shadowTiddlers[t] == "string")
+			results.push(t);
+	}
+	results.sort();
+	return results;
+};
+
+// Return an array of tiddlers that have been touched since they were downloaded or created
+TiddlyWiki.prototype.getTouched = function()
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		if(tiddler.isTouched())
+			results.push(tiddler);
+		});
+	results.sort();
+	return results;
+};
+
+// Resolves a Tiddler reference or tiddler title into a Tiddler object, or null if it doesn't exist
+TiddlyWiki.prototype.resolveTiddler = function(tiddler)
+{
+	var t = (typeof tiddler == 'string') ? this.getTiddler(tiddler) : tiddler;
+	return t instanceof Tiddler ? t : null;
+};
+
+TiddlyWiki.prototype.getLoader = function()
+{
+	if(!this.loader)
+		this.loader = new TW21Loader();
+	return this.loader;
+};
+
+TiddlyWiki.prototype.getSaver = function()
+{
+	if(!this.saver)
+		this.saver = new TW21Saver();
+	return this.saver;
+};
+
+// Returns true if path is a valid field name (path),
+// i.e. a sequence of identifiers, separated by '.'
+TiddlyWiki.isValidFieldName = function(name)
+{
+	var match = /[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)*/.exec(name);
+	return match && (match[0] == name);
+};
+
+// Throws an exception when name is not a valid field name.
+TiddlyWiki.checkFieldName = function(name)
+{
+	if(!TiddlyWiki.isValidFieldName(name))
+		throw config.messages.invalidFieldName.format([name]);
+};
+
+function StringFieldAccess(n,readOnly)
+{
+	this.set = readOnly ?
+			function(t,v) {if(v != t[n]) throw config.messages.fieldCannotBeChanged.format([n]);} :
+			function(t,v) {if(v != t[n]) {t[n] = v; return true;}};
+	this.get = function(t) {return t[n];};
+}
+
+function DateFieldAccess(n)
+{
+	this.set = function(t,v) {
+		var d = v instanceof Date ? v : Date.convertFromYYYYMMDDHHMM(v);
+		if(d != t[n]) {
+			t[n] = d; return true;
+		}
+	};
+	this.get = function(t) {return t[n].convertToYYYYMMDDHHMM();};
+}
+
+function LinksFieldAccess(n)
+{
+	this.set = function(t,v) {
+		var s = (typeof v == "string") ? v.readBracketedList() : v;
+		if(s.toString() != t[n].toString()) {
+			t[n] = s; return true;
+		}
+	};
+	this.get = function(t) {return String.encodeTiddlyLinkList(t[n]);};
+}
+
+TiddlyWiki.standardFieldAccess = {
+	// The set functions return true when setting the data has changed the value.
+	"title":    new StringFieldAccess("title",true),
+	// Handle the "tiddler" field name as the title
+	"tiddler":  new StringFieldAccess("title",true),
+	"text":     new StringFieldAccess("text"),
+	"modifier": new StringFieldAccess("modifier"),
+	"modified": new DateFieldAccess("modified"),
+	"created":  new DateFieldAccess("created"),
+	"tags":     new LinksFieldAccess("tags")
+};
+
+TiddlyWiki.isStandardField = function(name)
+{
+	return TiddlyWiki.standardFieldAccess[name] != undefined;
+};
+
+// Sets the value of the given field of the tiddler to the value.
+// Setting an ExtendedField's value to null or undefined removes the field.
+// Setting a namespace to undefined removes all fields of that namespace.
+// The fieldName is case-insensitive.
+// All values will be converted to a string value.
+TiddlyWiki.prototype.setValue = function(tiddler,fieldName,value)
+{
+	TiddlyWiki.checkFieldName(fieldName);
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return;
+	fieldName = fieldName.toLowerCase();
+	var isRemove = (value === undefined) || (value === null);
+	var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+	if(accessor) {
+		if(isRemove)
+			// don't remove StandardFields
+			return;
+		var h = TiddlyWiki.standardFieldAccess[fieldName];
+		if(!h.set(t,value))
+			return;
+	} else {
+		var oldValue = t.fields[fieldName];
+		if(isRemove) {
+			if(oldValue !== undefined) {
+				// deletes a single field
+				delete t.fields[fieldName];
+			} else {
+				// no concrete value is defined for the fieldName
+				// so we guess this is a namespace path.
+				// delete all fields in a namespace
+				var re = new RegExp('^'+fieldName+'\\.');
+				var dirty = false;
+				for(var n in t.fields) {
+					if(n.match(re)) {
+						delete t.fields[n];
+						dirty = true;
+					}
+				}
+				if(!dirty)
+					return;
+			}
+		} else {
+			// the "normal" set case. value is defined (not null/undefined)
+			// For convenience provide a nicer conversion Date->String
+			value = value instanceof Date ? value.convertToYYYYMMDDHHMMSSMMM() : String(value);
+			if(oldValue == value)
+				return;
+			t.fields[fieldName] = value;
+		}
+	}
+	// When we are here the tiddler/store really was changed.
+	this.notify(t.title,true);
+	if(!fieldName.match(/^temp\./))
+		this.setDirty(true);
+};
+
+// Returns the value of the given field of the tiddler.
+// The fieldName is case-insensitive.
+// Will only return String values (or undefined).
+TiddlyWiki.prototype.getValue = function(tiddler,fieldName)
+{
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return undefined;
+	fieldName = fieldName.toLowerCase();
+	var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+	if(accessor) {
+		return accessor.get(t);
+	}
+	return t.fields[fieldName];
+};
+
+// Calls the callback function for every field in the tiddler.
+// When callback function returns a non-false value the iteration stops
+// and that value is returned.
+// The order of the fields is not defined.
+// @param callback a function(tiddler,fieldName,value).
+TiddlyWiki.prototype.forEachField = function(tiddler,callback,onlyExtendedFields)
+{
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return undefined;
+	for(var n in t.fields) {
+		var result = callback(t,n,t.fields[n]);
+		if(result)
+			return result;
+		}
+	if(onlyExtendedFields)
+		return undefined;
+	for(var n in TiddlyWiki.standardFieldAccess) {
+		if(n == "tiddler")
+			// even though the "title" field can also be referenced through the name "tiddler"
+			// we only visit this field once.
+			continue;
+		var result = callback(t,n,TiddlyWiki.standardFieldAccess[n].get(t));
+		if(result)
+			return result;
+	}
+	return undefined;
+};
+
+//--
+//-- Story functions
+//--
+
+function Story(container,idPrefix)
+{
+	this.container = container;
+	this.idPrefix = idPrefix;
+	this.highlightRegExp = null;
+}
+
+Story.prototype.forEachTiddler = function(fn)
+{
+	var place = document.getElementById(this.container);
+	if(!place)
+		return;
+	var e = place.firstChild;
+	while(e) {
+		var n = e.nextSibling;
+		var title = e.getAttribute("tiddler");
+		fn.call(this,title,e);
+		e = n;
+	}
+};
+
+Story.prototype.displayTiddlers = function(srcElement,titles,template,animate,unused,customFields,toggle)
+{
+	for(var t = titles.length-1;t>=0;t--)
+		this.displayTiddler(srcElement,titles[t],template,animate,unused,customFields);
+};
+
+Story.prototype.displayTiddler = function(srcElement,title,template,animate,unused,customFields,toggle)
+{
+	var place = document.getElementById(this.container);
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem) {
+		if(toggle)
+			this.closeTiddler(title,true);
+		else
+			this.refreshTiddler(title,template,false,customFields);
+	} else {
+		var before = this.positionTiddler(srcElement);
+		tiddlerElem = this.createTiddler(place,before,title,template,customFields);
+	}
+	if(srcElement && typeof srcElement !== "string") {
+		if(config.options.chkAnimate && (animate == undefined || animate == true) && anim && typeof Zoomer == "function" && typeof Scroller == "function")
+			anim.startAnimating(new Zoomer(title,srcElement,tiddlerElem),new Scroller(tiddlerElem));
+		else
+			window.scrollTo(0,ensureVisible(tiddlerElem));
+	}
+};
+
+Story.prototype.positionTiddler = function(srcElement)
+{
+	var place = document.getElementById(this.container);
+	var before = null;
+	if(typeof srcElement == "string") {
+		switch(srcElement) {
+			case "top":
+				before = place.firstChild;
+				break;
+			case "bottom":
+				before = null;
+				break;
+		}
+	} else {
+		var after = this.findContainingTiddler(srcElement);
+		if(after == null) {
+			before = place.firstChild;
+		} else if(after.nextSibling) {
+			before = after.nextSibling;
+			if(before.nodeType != 1)
+				before = null;
+		}
+	}
+	return before;
+};
+
+Story.prototype.createTiddler = function(place,before,title,template,customFields)
+{
+	var tiddlerElem = createTiddlyElement(null,"div",this.idPrefix + title,"tiddler");
+	tiddlerElem.setAttribute("refresh","tiddler");
+	if(customFields)
+		tiddlerElem.setAttribute("tiddlyFields",customFields);
+	place.insertBefore(tiddlerElem,before);
+	var defaultText = null;
+	if(!store.tiddlerExists(title) && !store.isShadowTiddler(title))
+		defaultText = this.loadMissingTiddler(title,customFields,tiddlerElem);
+	this.refreshTiddler(title,template,false,customFields,defaultText);
+	return tiddlerElem;
+};
+
+Story.prototype.loadMissingTiddler = function(title,fields,tiddlerElem)
+{
+	var tiddler = new Tiddler(title);
+	tiddler.fields = typeof fields == "string" ?  fields.decodeHashMap() : (fields ? fields : {});
+	var serverType = tiddler.getServerType();
+	var host = tiddler.fields['server.host'];
+	var workspace = tiddler.fields['server.workspace'];
+	if(!serverType | !host)
+		return null;
+	var sm = new SyncMachine(serverType,{
+			start: function() {
+				return this.openHost(host,"openWorkspace");
+			},
+			openWorkspace: function() {
+				return this.openWorkspace(workspace,"getTiddler");
+			},
+			getTiddler: function() {
+				return this.getTiddler(title,"gotTiddler");
+			},
+			gotTiddler: function(tiddler) {
+				if(tiddler && tiddler.text) {
+					var downloaded = new Date();
+					if(!tiddler.created)
+						tiddler.created = downloaded;
+					if(!tiddler.modified)
+						tiddler.modified = tiddler.created;
+					store.saveTiddler(tiddler.title,tiddler.title,tiddler.text,tiddler.modifier,tiddler.modified,tiddler.tags,tiddler.fields,true,tiddler.created);
+					autoSaveChanges();
+				}
+				delete this;
+				return true;
+			},
+			error: function(message) {
+				displayMessage("Error loading missing tiddler from %0: %1".format([host,message]));
+			}
+		});
+	sm.go();
+	return config.messages.loadingMissingTiddler.format([title,serverType,host,workspace]);
+};
+
+Story.prototype.chooseTemplateForTiddler = function(title,template)
+{
+	if(!template)
+		template = DEFAULT_VIEW_TEMPLATE;
+	if(template == DEFAULT_VIEW_TEMPLATE || template == DEFAULT_EDIT_TEMPLATE)
+		template = config.tiddlerTemplates[template];
+	return template;
+};
+
+Story.prototype.getTemplateForTiddler = function(title,template,tiddler)
+{
+	return store.getRecursiveTiddlerText(template,null,10);
+};
+
+Story.prototype.refreshTiddler = function(title,template,force,customFields,defaultText)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem) {
+		if(tiddlerElem.getAttribute("dirty") == "true" && !force)
+			return tiddlerElem;
+		template = this.chooseTemplateForTiddler(title,template);
+		var currTemplate = tiddlerElem.getAttribute("template");
+		if((template != currTemplate) || force) {
+			var tiddler = store.getTiddler(title);
+			if(!tiddler) {
+				tiddler = new Tiddler();
+				if(store.isShadowTiddler(title)) {
+					tiddler.set(title,store.getTiddlerText(title),config.views.wikified.shadowModifier,version.date,[],version.date);
+				} else {
+					var text = template=="EditTemplate" ?
+								config.views.editor.defaultText.format([title]) :
+								config.views.wikified.defaultText.format([title]);
+					text = defaultText ? defaultText : text;
+					var fields = customFields ? customFields.decodeHashMap() : null;
+					tiddler.set(title,text,config.views.wikified.defaultModifier,version.date,[],version.date,fields);
+				}
+			}
+			tiddlerElem.setAttribute("tags",tiddler.tags.join(" "));
+			tiddlerElem.setAttribute("tiddler",title);
+			tiddlerElem.setAttribute("template",template);
+			var me = this;
+			tiddlerElem.onmouseover = this.onTiddlerMouseOver;
+			tiddlerElem.onmouseout = this.onTiddlerMouseOut;
+			tiddlerElem.ondblclick = this.onTiddlerDblClick;
+			tiddlerElem[window.event?"onkeydown":"onkeypress"] = this.onTiddlerKeyPress;
+			var html = this.getTemplateForTiddler(title,template,tiddler);
+			tiddlerElem.innerHTML = html;
+			applyHtmlMacros(tiddlerElem,tiddler);
+			if(store.getTaggedTiddlers(title).length > 0)
+				addClass(tiddlerElem,"isTag");
+			else
+				removeClass(tiddlerElem,"isTag");
+			if(!store.tiddlerExists(title)) {
+				if(store.isShadowTiddler(title))
+					addClass(tiddlerElem,"shadow");
+				else
+					addClass(tiddlerElem,"missing");
+			} else {
+				removeClass(tiddlerElem,"shadow");
+				removeClass(tiddlerElem,"missing");
+			}
+			if(customFields)
+				this.addCustomFields(tiddlerElem,customFields);
+			forceReflow();
+		}
+	}
+	return tiddlerElem;
+};
+
+Story.prototype.addCustomFields = function(place,customFields)
+{
+	var fields = customFields.decodeHashMap();
+	var w = document.createElement("div");
+	w.style.display = "none";
+	place.appendChild(w);
+	for(var t in fields) {
+		var e = document.createElement("input");
+		e.setAttribute("type","text");
+		e.setAttribute("value",fields[t]);
+		w.appendChild(e);
+		e.setAttribute("edit",t);
+	}
+};
+
+Story.prototype.refreshAllTiddlers = function() 
+{
+	var place = document.getElementById(this.container);
+	var e = place.firstChild;
+	if(!e)
+		return;
+	this.refreshTiddler(e.getAttribute("tiddler"),e.getAttribute("template"),true);
+	while((e = e.nextSibling) != null) 
+		this.refreshTiddler(e.getAttribute("tiddler"),e.getAttribute("template"),true);
+};
+
+Story.prototype.onTiddlerMouseOver = function(e)
+{
+	if(window.addClass instanceof Function)
+		addClass(this,"selected");
+};
+
+Story.prototype.onTiddlerMouseOut = function(e)
+{
+	if(window.removeClass instanceof Function)
+		removeClass(this,"selected");
+};
+
+Story.prototype.onTiddlerDblClick = function(e)
+{
+	if(!e) var e = window.event;
+	var theTarget = resolveTarget(e);
+	if(theTarget && theTarget.nodeName.toLowerCase() != "input" && theTarget.nodeName.toLowerCase() != "textarea") {
+		if(document.selection && document.selection.empty)
+			document.selection.empty();
+		config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+		e.cancelBubble = true;
+		if(e.stopPropagation) e.stopPropagation();
+		return true;
+	} else {
+		return false;
+	}
+};
+
+Story.prototype.onTiddlerKeyPress = function(e)
+{
+	if(!e) var e = window.event;
+	clearMessage();
+	var consume = false; 
+	var title = this.getAttribute("tiddler");
+	var target = resolveTarget(e);
+	switch(e.keyCode) {
+		case 9: // Tab
+			if(config.options.chkInsertTabs && target.tagName.toLowerCase() == "textarea") {
+				replaceSelection(target,String.fromCharCode(9));
+				consume = true; 
+			}
+			if(config.isOpera) {
+				target.onblur = function() {
+					this.focus();
+					this.onblur = null;
+				};
+			}
+			break;
+		case 13: // Ctrl-Enter
+		case 10: // Ctrl-Enter on IE PC
+		case 77: // Ctrl-Enter is "M" on some platforms
+			if(e.ctrlKey) {
+				blurElement(this);
+				config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+				consume = true;
+			}
+			break; 
+		case 27: // Escape
+			blurElement(this);
+			config.macros.toolbar.invokeCommand(this,"cancelCommand",e);
+			consume = true;
+			break;
+	}
+	e.cancelBubble = consume;
+	if(consume) {
+		if(e.stopPropagation) e.stopPropagation(); // Stop Propagation
+		e.returnValue = true; // Cancel The Event in IE
+		if(e.preventDefault ) e.preventDefault(); // Cancel The Event in Moz
+	}
+	return !consume;
+};
+
+Story.prototype.getTiddlerField = function(title,field)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	var e = null;
+	if(tiddlerElem != null) {
+		var children = tiddlerElem.getElementsByTagName("*");
+		for(var t=0; t<children.length; t++) {
+			var c = children[t];
+			if(c.tagName.toLowerCase() == "input" || c.tagName.toLowerCase() == "textarea") {
+				if(!e)
+					e = c;
+				if(c.getAttribute("edit") == field)
+					e = c;
+			}
+		}
+	}
+	return e;
+};
+
+Story.prototype.focusTiddler = function(title,field)
+{
+	var e = this.getTiddlerField(title,field);
+	if(e) {
+		e.focus();
+		e.select();
+	}
+};
+
+Story.prototype.blurTiddler = function(title)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null && tiddlerElem.focus && tiddlerElem.blur) {
+		tiddlerElem.focus();
+		tiddlerElem.blur();
+	}
+};
+
+Story.prototype.setTiddlerField = function(title,tag,mode,field)
+{
+	var c = story.getTiddlerField(title,field);
+
+	var tags = c.value.readBracketedList();
+	tags.setItem(tag,mode);
+	c.value = String.encodeTiddlyLinkList(tags);
+};
+
+Story.prototype.setTiddlerTag = function(title,tag,mode)
+{
+	Story.prototype.setTiddlerField(title,tag,mode,"tags");
+};
+
+Story.prototype.closeTiddler = function(title,animate,unused)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null) {
+		clearMessage();
+		this.scrubTiddler(tiddlerElem);
+		if(config.options.chkAnimate && animate && anim && typeof Slider == "function")
+			anim.startAnimating(new Slider(tiddlerElem,false,null,"all"));
+		else {
+			removeNode(tiddlerElem);
+			forceReflow();
+		}
+	}
+};
+
+Story.prototype.scrubTiddler = function(tiddlerElem)
+{
+	tiddlerElem.id = null;
+};
+
+Story.prototype.setDirty = function(title,dirty)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		tiddlerElem.setAttribute("dirty",dirty ? "true" : "false");
+};
+
+Story.prototype.isDirty = function(title)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		return tiddlerElem.getAttribute("dirty") == "true";
+	return null;
+};
+
+Story.prototype.areAnyDirty = function()
+{
+	var r = false;
+	this.forEachTiddler(function(title,element) {
+		if(this.isDirty(title))
+			r = true;
+	});
+	return r;
+};
+
+Story.prototype.closeAllTiddlers = function(exclude)
+{
+	clearMessage();
+	this.forEachTiddler(function(title,element) {
+		if((title != exclude) && element.getAttribute("dirty") != "true")
+			this.closeTiddler(title);
+	});
+	window.scrollTo(0,ensureVisible(this.container));
+};
+
+Story.prototype.isEmpty = function()
+{
+	var place = document.getElementById(this.container);
+	return place && place.firstChild == null;
+};
+
+Story.prototype.search = function(text,useCaseSensitive,useRegExp)
+{
+	this.closeAllTiddlers();
+	highlightHack = new RegExp(useRegExp ?	 text : text.escapeRegExp(),useCaseSensitive ? "mg" : "img");
+	var matches = store.search(highlightHack,"title","excludeSearch");
+	var titles = [];
+	for(var t=0;t<matches.length;t++)
+		titles.push(matches[t].title);
+	this.displayTiddlers(null,titles);
+	highlightHack = null;
+	var q = useRegExp ? "/" : "'";
+	if(matches.length > 0)
+		displayMessage(config.macros.search.successMsg.format([titles.length.toString(),q + text + q]));
+	else
+		displayMessage(config.macros.search.failureMsg.format([q + text + q]));
+};
+
+Story.prototype.findContainingTiddler = function(e)
+{
+	while(e && !hasClass(e,"tiddler"))
+		e = e.parentNode;
+	return e;
+};
+
+Story.prototype.gatherSaveFields = function(e,fields)
+{
+	if(e && e.getAttribute) {
+		var f = e.getAttribute("edit");
+		if(f)
+			fields[f] = e.value.replace(/\r/mg,"");
+		if(e.hasChildNodes()) {
+			var c = e.childNodes;
+			for(var t=0; t<c.length; t++)
+				this.gatherSaveFields(c[t],fields);
+		}
+	}
+};
+
+Story.prototype.hasChanges = function(title)
+{
+	var e = document.getElementById(this.idPrefix + title);
+	if(e != null) {
+		var fields = {};
+		this.gatherSaveFields(e,fields);
+		var tiddler = store.fetchTiddler(title);
+		if(!tiddler)
+			return false;
+		for(var n in fields) {
+			if(store.getValue(title,n) != fields[n])
+				return true;
+		}
+	}
+	return false;
+};
+
+Story.prototype.saveTiddler = function(title,minorUpdate)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null) {
+		var fields = {};
+		this.gatherSaveFields(tiddlerElem,fields);
+		var newTitle = fields.title ? fields.title : title;
+		if(store.tiddlerExists(newTitle) && newTitle != title) {
+			if(!confirm(config.messages.overwriteWarning.format([newTitle.toString()])))
+				return null;
+		}
+		if(newTitle != title)
+			this.closeTiddler(newTitle,false);
+		tiddlerElem.id = this.idPrefix + newTitle;
+		tiddlerElem.setAttribute("tiddler",newTitle);
+		tiddlerElem.setAttribute("template",DEFAULT_VIEW_TEMPLATE);
+		tiddlerElem.setAttribute("dirty","false");
+		if(config.options.chkForceMinorUpdate)
+			minorUpdate = !minorUpdate;
+		if(!store.tiddlerExists(newTitle))
+			minorUpdate = false;
+		var newDate = new Date();
+		var extendedFields = store.tiddlerExists(newTitle) ? store.fetchTiddler(newTitle).fields : {};
+		for(var n in fields) {
+			if(!TiddlyWiki.isStandardField(n))
+				extendedFields[n] = fields[n];
+			}
+		var tiddler = store.saveTiddler(title,newTitle,fields.text,minorUpdate ? undefined : config.options.txtUserName,minorUpdate ? undefined : newDate,fields.tags,extendedFields);
+		autoSaveChanges(null,[tiddler]);
+		return newTitle;
+	}
+	return null;
+};
+
+Story.prototype.permaView = function()
+{
+	var links = [];
+	this.forEachTiddler(function(title,element) {
+		links.push(String.encodeTiddlyLink(title));
+	});
+	var t = encodeURIComponent(links.join(" "));
+	if(t == "")
+		t = "#";
+	if(window.location.hash != t)
+		window.location.hash = t;
+};
+
+//--
+//-- Backstage
+//--
+
+var backstage = {
+	area: null,
+	toolbar: null,
+	button: null,
+	showButton: null,
+	hideButton: null,
+	cloak: null,
+	panel: null,
+	panelBody: null,
+	panelFooter: null,
+	currTabName: null,
+	currTabElem: null,
+	content: null,
+
+	init: function() {
+		var cmb = config.messages.backstage;
+		this.area = document.getElementById("backstageArea");
+		this.toolbar = document.getElementById("backstageToolbar");
+		this.button = document.getElementById("backstageButton");
+		this.button.style.display = "block";
+		var t = cmb.open.text + " " + glyph("bentArrowLeft");
+		this.showButton = createTiddlyButton(this.button,t,cmb.open.tooltip,
+						function (e) {backstage.show(); return false;},null,"backstageShow");
+		t = glyph("bentArrowRight") + " " + cmb.close.text;
+		this.hideButton = createTiddlyButton(this.button,t,cmb.close.tooltip,
+						function (e) {backstage.hide(); return false;},null,"backstageHide");
+		this.cloak = document.getElementById("backstageCloak");
+		this.panel = document.getElementById("backstagePanel");
+		this.panelFooter = createTiddlyElement(this.panel,"div",null,"backstagePanelFooter");
+		this.panelBody = createTiddlyElement(this.panel,"div",null,"backstagePanelBody");
+		this.cloak.onmousedown = function(e) {
+			backstage.switchTab(null);
+		};
+		createTiddlyText(this.toolbar,cmb.prompt);
+		for(t=0; t<config.backstageTasks.length; t++) {
+			var taskName = config.backstageTasks[t];
+			var task = config.tasks[taskName];
+			var handler = task.action ? this.onClickCommand : this.onClickTab;
+			var text = task.text + (task.action ? "" : glyph("downTriangle"));
+			var btn = createTiddlyButton(this.toolbar,text,task.tooltip,handler,"backstageTab");
+			btn.setAttribute("task",taskName);
+			addClass(btn,task.action ? "backstageAction" : "backstageTask");
+			}
+		this.content = document.getElementById("contentWrapper");
+		if(config.options.chkBackstage)
+			this.show();
+		else
+			this.hide();
+	},
+	
+	isVisible: function () {
+		return this.area ? this.area.style.display == "block" : false;
+	},
+	
+	show: function() {
+		this.area.style.display = "block";
+		if(anim && config.options.chkAnimate) {
+			backstage.toolbar.style.left = findWindowWidth() + "px";
+			var p = [
+				{style: "left", start: findWindowWidth(), end: 0, template: "%0px"}
+			];
+			anim.startAnimating(new Morpher(backstage.toolbar,config.animDuration,p));
+		} else {
+			backstage.area.style.left = "0px";
+		}
+		this.showButton.style.display = "none";
+		this.hideButton.style.display = "block";
+		config.options.chkBackstage = true;
+		saveOptionCookie("chkBackstage");
+		addClass(this.content,"backstageVisible");
+	},
+
+	hide: function() {
+		if(this.currTabElem) {
+			this.switchTab(null);
+		} else {
+			backstage.toolbar.style.left = "0px";
+			if(anim && config.options.chkAnimate) {
+				var p = [
+					{style: "left", start: 0, end: findWindowWidth(), template: "%0px"}
+				];
+				var c = function(element,properties) {backstage.area.style.display = "none";};
+				anim.startAnimating(new Morpher(backstage.toolbar,config.animDuration,p,c));
+			} else {
+				this.area.style.display = "none";
+			}
+			this.showButton.style.display = "block";
+			this.hideButton.style.display = "none";
+			config.options.chkBackstage = false;
+			saveOptionCookie("chkBackstage");
+			removeClass(this.content,"backstageVisible");
+		}
+	},
+
+	onClickCommand: function(e) {
+		var task = config.tasks[this.getAttribute("task")];
+		displayMessage(task);
+		if(task.action) {
+			backstage.switchTab(null);
+			task.action();
+		}
+		return false;
+	},
+
+	onClickTab: function(e) {
+		backstage.switchTab(this.getAttribute("task"));
+		return false;
+	},
+
+	// Switch to a given tab, or none if null is passed
+	switchTab: function(tabName) {
+		var tabElem = null;
+		var e = this.toolbar.firstChild;
+		while(e)
+			{
+			if(e.getAttribute && e.getAttribute("task") == tabName)
+				tabElem = e;
+			e = e.nextSibling;
+			}
+		if(tabName == backstage.currTabName)
+			return;
+		if(backstage.currTabElem) {
+			removeClass(this.currTabElem,"backstageSelTab");
+		}
+		if(tabElem && tabName) {
+			backstage.preparePanel();
+			addClass(tabElem,"backstageSelTab");
+			var task = config.tasks[tabName];
+			wikify(task.content,backstage.panelBody,null,null);
+			backstage.showPanel();
+		} else if(backstage.currTabElem) {
+			backstage.hidePanel();
+		}
+		backstage.currTabName = tabName;
+		backstage.currTabElem = tabElem;
+	},
+
+	isPanelVisible: function() {
+		return backstage.panel ? backstage.panel.style.display == "block" : false;
+	},
+
+	preparePanel: function() {
+		backstage.cloak.style.height = findWindowHeight() + "px";
+		backstage.cloak.style.display = "block";
+		removeChildren(backstage.panelBody);
+		return backstage.panelBody;
+	},
+	
+	showPanel: function() {
+		backstage.panel.style.display = "block";
+		if(anim && config.options.chkAnimate) {
+			backstage.panel.style.top = (-backstage.panel.offsetHeight) + "px";
+			var p = [
+				{style: "top", start: -backstage.panel.offsetHeight, end: 0, template: "%0px"}
+			];
+			anim.startAnimating(new Morpher(backstage.panel,config.animDuration,p),new Scroller(backstage.panel,false));
+		} else {
+			backstage.panel.style.top = "0px";
+		}
+		return backstage.panelBody;
+	},
+	
+	hidePanel: function() {
+		backstage.currTabName = null;
+		backstage.currTabElem = null;
+		if(anim && config.options.chkAnimate) {
+			var p = [
+				{style: "top", start: 0, end: -(backstage.panel.offsetHeight), template: "%0px"},
+				{style: "display", atEnd: "none"}
+			];
+			var c = function(element,properties) {backstage.cloak.style.display = "none";};
+			anim.startAnimating(new Morpher(backstage.panel,config.animDuration,p,c));
+		 } else {
+			backstage.panel.style.display = "none";
+			backstage.cloak.style.display = "none";
+		}
+	}
+};
+
+config.macros.backstage = {};
+
+config.macros.backstage.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var backstageTask = config.tasks[params[0]];
+	if(backstageTask)
+		createTiddlyButton(place,backstageTask.text,backstageTask.tooltip,function(e) {backstage.switchTab(params[0]); return false;});
+};
+
+//--
+//-- ImportTiddlers macro
+//--
+
+config.macros.importTiddlers.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(readOnly) {
+		createTiddlyElement(place,"div",null,"marked",this.readOnlyWarning);
+		return;
+	}
+	var w = new Wizard();
+	w.createWizard(place,this.wizardTitle);
+	this.restart(w);
+};
+
+config.macros.importTiddlers.onCancel = function(e)
+{
+	var wizard = new Wizard(this);
+	var place = wizard.clear();
+	config.macros.importTiddlers.restart(wizard);
+	return false;
+};
+
+config.macros.importTiddlers.restart = function(wizard)
+{
+	wizard.addStep(this.step1Title,this.step1Html);
+	var s = wizard.getElement("selTypes");
+	for(var t in config.adaptors) {
+		var e = createTiddlyElement(s,"option",null,null,t);
+		e.value = t;
+	}
+	s = wizard.getElement("selFeeds");
+	var feeds = this.getFeeds();
+	for(t in feeds) {
+		e = createTiddlyElement(s,"option",null,null,t);
+		e.value = t;
+	}
+	wizard.setValue("feeds",feeds);
+	s.onchange = config.macros.importTiddlers.onFeedChange;
+	var fileInput = wizard.getElement("txtBrowse");
+	fileInput.onchange = config.macros.importTiddlers.onBrowseChange;
+	fileInput.onkeyup = config.macros.importTiddlers.onBrowseChange;
+	wizard.setButtons([{caption: this.openLabel, tooltip: this.openPrompt, onClick: config.macros.importTiddlers.onOpen}]);
+};
+
+config.macros.importTiddlers.getFeeds = function()
+{
+	var feeds = {};
+	var tagged = store.getTaggedTiddlers("systemServer","title");
+	for(var t=0; t<tagged.length; t++) {
+		var title = tagged[t].title;
+		var serverType = store.getTiddlerSlice(title,"Type");
+		if(!serverType)
+			serverType = "file";
+		feeds[title] = {title: title,
+						url: store.getTiddlerSlice(title,"URL"),
+						workspace: store.getTiddlerSlice(title,"Workspace"),
+						workspaceList: store.getTiddlerSlice(title,"WorkspaceList"),
+						tiddlerFilter: store.getTiddlerSlice(title,"TiddlerFilter"),
+						serverType: serverType,
+						description: store.getTiddlerSlice(title,"Description")};
+	}
+	return feeds;
+};
+
+config.macros.importTiddlers.onFeedChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var selTypes = wizard.getElement("selTypes");
+	var fileInput = wizard.getElement("txtPath");
+	var feeds = wizard.getValue("feeds");
+	var f = feeds[this.value];
+	if(f) {
+		selTypes.value = f.serverType;
+		fileInput.value = f.url;
+		this.selectedIndex = 0;
+		wizard.setValue("feedName",f.serverType);
+		wizard.setValue("feedHost",f.url);
+		wizard.setValue("feedWorkspace",f.workspace);
+		wizard.setValue("feedWorkspaceList",f.workspaceList);
+		wizard.setValue("feedTiddlerFilter",f.tiddlerFilter);
+	}
+	return false;
+};
+
+config.macros.importTiddlers.onBrowseChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var fileInput = wizard.getElement("txtPath");
+	fileInput.value = "file://" + this.value;
+	var serverType = wizard.getElement("selTypes");
+	serverType.value = "file";
+	return false;
+};
+
+config.macros.importTiddlers.onOpen = function(e)
+{
+	var wizard = new Wizard(this);
+	var fileInput = wizard.getElement("txtPath");
+	var url = fileInput.value;
+	var serverType = wizard.getElement("selTypes").value;
+	var adaptor = new config.adaptors[serverType];
+	wizard.setValue("adaptor",adaptor);
+	wizard.setValue("serverType",serverType);
+	wizard.setValue("host",url);
+	var context = {};
+	var ret = adaptor.openHost(url,context,wizard,config.macros.importTiddlers.onOpenHost);
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusOpenHost);
+	return false;
+};
+
+config.macros.importTiddlers.onOpenHost = function(context,wizard)
+{
+	var adaptor = wizard.getValue("adaptor");
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onOpenHost: " + context.statusText);
+	var ret = adaptor.getWorkspaceList(context,wizard,config.macros.importTiddlers.onGetWorkspaceList);
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusGetWorkspaceList);
+};
+
+config.macros.importTiddlers.onGetWorkspaceList = function(context,wizard)
+{
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onGetWorkspaceList: " + context.statusText);
+	wizard.addStep(config.macros.importTiddlers.step2Title,config.macros.importTiddlers.step2Html);
+	var s = wizard.getElement("selWorkspace");
+	s.onchange = config.macros.importTiddlers.onWorkspaceChange;
+	for(var t=0; t<context.workspaces.length; t++) {
+		var e = createTiddlyElement(s,"option",null,null,context.workspaces[t].title);
+		e.value = context.workspaces[t].title;
+	}
+	var workspaceList = wizard.getValue("feedWorkspaceList");
+	if(workspaceList) {
+		var list = workspaceList.parseParams("workspace",null,false,true);
+		for(var n=1; n<list.length; n++) {
+			if(context.workspaces.findByField("title",list[n].value) == null) {
+				e = createTiddlyElement(s,"option",null,null,list[n].value);
+				e.value = list[n].value;
+			}
+		}
+	}
+	var workspace = wizard.getValue("feedWorkspace");
+	if(workspace) {
+		t = wizard.getElement("txtWorkspace");
+		t.value = workspace;
+	}
+	wizard.setButtons([{caption: config.macros.importTiddlers.openLabel, tooltip: config.macros.importTiddlers.openPrompt, onClick: config.macros.importTiddlers.onChooseWorkspace}]);
+};
+
+config.macros.importTiddlers.onWorkspaceChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var t = wizard.getElement("txtWorkspace");
+	t.value  = this.value;
+	this.selectedIndex = 0;
+	return false;
+};
+
+config.macros.importTiddlers.onChooseWorkspace = function(e)
+{
+	var wizard = new Wizard(this);
+	var adaptor = wizard.getValue("adaptor");
+	var workspace = wizard.getElement("txtWorkspace").value;
+	wizard.setValue("workspace",workspace);
+	var context = {};
+	var ret = adaptor.openWorkspace(workspace,context,wizard,config.macros.importTiddlers.onOpenWorkspace);
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusOpenWorkspace);
+	return false;
+};
+
+config.macros.importTiddlers.onOpenWorkspace = function(context,wizard)
+{
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onOpenWorkspace: " + context.statusText);
+	var adaptor = wizard.getValue("adaptor");
+	var ret = adaptor.getTiddlerList(context,wizard,config.macros.importTiddlers.onGetTiddlerList,wizard.getValue("feedTiddlerFilter"));
+	if(ret !== true)
+		displayMessage(ret);
+	wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusGetTiddlerList);
+};
+
+config.macros.importTiddlers.onGetTiddlerList = function(context,wizard)
+{
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onGetTiddlerList: " + context.statusText);
+	// Extract data for the listview
+	var listedTiddlers = [];
+	if(context.tiddlers) {
+		for(var n=0; n<context.tiddlers.length; n++) {
+			var tiddler = context.tiddlers[n];
+			listedTiddlers.push({
+				title: tiddler.title,
+				modified: tiddler.modified,
+				modifier: tiddler.modifier,
+				text: tiddler.text ? wikifyPlainText(tiddler.text,100) : "",
+				tags: tiddler.tags,
+				size: tiddler.text ? tiddler.text.length : 0,
+				tiddler: tiddler
+			});
+		}
+	}
+	listedTiddlers.sort(function(a,b) {return a.title < b.title ? -1 : (a.title == b.title ? 0 : +1);});
+	// Display the listview
+	wizard.addStep(config.macros.importTiddlers.step3Title,config.macros.importTiddlers.step3Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	var listView = ListView.create(listWrapper,listedTiddlers,config.macros.importTiddlers.listViewTemplate);
+	wizard.setValue("listView",listView);
+	var txtSaveTiddler = wizard.getElement("txtSaveTiddler");
+	txtSaveTiddler.value = config.macros.importTiddlers.generateSystemServerName(wizard);
+	wizard.setButtons([
+			{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel},
+			{caption: config.macros.importTiddlers.importLabel, tooltip: config.macros.importTiddlers.importPrompt, onClick:  config.macros.importTiddlers.doImport}
+		]);
+};
+
+config.macros.importTiddlers.generateSystemServerName = function(wizard)
+{
+	var serverType = wizard.getValue("serverType");
+	var host = wizard.getValue("host");
+	var workspace = wizard.getValue("workspace");
+	var pattern = config.macros.importTiddlers[workspace ? "systemServerNamePattern" : "systemServerNamePatternNoWorkspace"];
+	return pattern.format([serverType,host,workspace]);
+};
+
+config.macros.importTiddlers.saveServerTiddler = function(wizard)
+{
+	var txtSaveTiddler = wizard.getElement("txtSaveTiddler").value;
+	if(store.tiddlerExists(txtSaveTiddler)) {
+		if(!confirm(config.macros.importTiddlers.confirmOverwriteSaveTiddler.format([txtSaveTiddler])))
+			return;
+		store.suspendNotifications();
+		store.removeTiddler(txtSaveTiddler);
+		store.resumeNotifications();
+	}
+	var serverType = wizard.getValue("serverType");
+	var host = wizard.getValue("host");
+	var workspace = wizard.getValue("workspace");
+	var text = config.macros.importTiddlers.serverSaveTemplate.format([serverType,host,workspace]);
+	store.saveTiddler(txtSaveTiddler,txtSaveTiddler,text,config.macros.importTiddlers.serverSaveModifier,new Date(),["systemServer"]);
+};
+
+config.macros.importTiddlers.doImport = function(e)
+{
+	var wizard = new Wizard(this);
+	if(wizard.getElement("chkSave").checked)
+		config.macros.importTiddlers.saveServerTiddler(wizard);
+	var chkSync = wizard.getElement("chkSync").checked;
+	wizard.setValue("sync",chkSync);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	var adaptor = wizard.getValue("adaptor");
+	var overwrite = new Array();
+	var t;
+	for(t=0; t<rowNames.length; t++) {
+		if(store.tiddlerExists(rowNames[t]))
+			overwrite.push(rowNames[t]);
+	}
+	if(overwrite.length > 0) {
+		if(!confirm(config.macros.importTiddlers.confirmOverwriteText.format([overwrite.join(", ")])))
+			return false;
+	}
+	wizard.addStep(config.macros.importTiddlers.step4Title.format([rowNames.length]),config.macros.importTiddlers.step4Html);
+	for(t=0; t<rowNames.length; t++) {
+		var link = document.createElement("div");
+		createTiddlyLink(link,rowNames[t],true);
+		var place = wizard.getElement("markReport");
+		place.parentNode.insertBefore(link,place);
+	}
+	wizard.setValue("remainingImports",rowNames.length);
+	wizard.setButtons([
+			{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}
+		],config.macros.importTiddlers.statusDoingImport);
+	for(t=0; t<rowNames.length; t++) {
+		var context = {};
+		context.allowSynchronous = true;
+		var inbound = adaptor.getTiddler(rowNames[t],context,wizard,config.macros.importTiddlers.onGetTiddler);
+	}
+	return false;
+};
+
+config.macros.importTiddlers.onGetTiddler = function(context,wizard)
+{
+	if(!context.status)
+		displayMessage("Error in importTiddlers.onGetTiddler: " + context.statusText);
+	var tiddler = context.tiddler;
+	store.suspendNotifications();
+	store.saveTiddler(tiddler.title, tiddler.title, tiddler.text, tiddler.modifier, tiddler.modified, tiddler.tags, tiddler.fields, true, tiddler.created);
+	if(!wizard.getValue("sync")) {
+		store.setValue(tiddler.title,'server',null);
+	}
+	store.resumeNotifications();
+	if(!context.isSynchronous) 
+		store.notify(tiddler.title,true);
+	var remainingImports = wizard.getValue("remainingImports")-1;
+	wizard.setValue("remainingImports",remainingImports);
+	if(remainingImports == 0) {
+		if(context.isSynchronous) {
+			store.notifyAll();
+			refreshDisplay();
+		}
+		wizard.setButtons([
+				{caption: config.macros.importTiddlers.doneLabel, tooltip: config.macros.importTiddlers.donePrompt, onClick: config.macros.importTiddlers.onCancel}
+			],config.macros.importTiddlers.statusDoneImport);
+		autoSaveChanges();
+	}
+};
+
+//--
+//-- Sync macro
+//--
+
+// Synchronisation handlers
+config.syncers = {};
+
+// Sync state.
+var currSync = null;
+
+// sync macro
+config.macros.sync.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!wikifier.isStatic)
+		this.startSync(place);
+};
+
+config.macros.sync.startSync = function(place)
+{
+	if(currSync)
+		config.macros.sync.cancelSync();
+	currSync = {};
+	currSync.syncList = this.getSyncableTiddlers();
+	this.createSyncTasks();
+	this.preProcessSyncableTiddlers();
+	var wizard = new Wizard();
+	currSync.wizard = wizard;
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	currSync.listView = ListView.create(listWrapper,currSync.syncList,this.listViewTemplate);
+	this.processSyncableTiddlers();
+	wizard.setButtons([
+			{caption: this.syncLabel, tooltip: this.syncPrompt, onClick: this.doSync}
+		]);
+};
+
+config.macros.sync.getSyncableTiddlers = function ()
+{
+	var list = [];
+	store.forEachTiddler(function(title,tiddler) {
+		var syncItem = {};
+		syncItem.serverType = tiddler.getServerType();
+		syncItem.serverHost = tiddler.fields['server.host'];
+		syncItem.serverWorkspace = tiddler.fields['server.workspace'];
+		syncItem.tiddler = tiddler;
+		syncItem.title = tiddler.title;
+		syncItem.isTouched = tiddler.isTouched();
+		syncItem.selected = syncItem.isTouched;
+		syncItem.syncStatus = config.macros.sync.syncStatusList[syncItem.isTouched ? "changedLocally" : "none"];
+		syncItem.status = syncItem.syncStatus.text;
+		if(syncItem.serverType && syncItem.serverHost)
+			list.push(syncItem);
+		});
+	list.sort(function(a,b) {return a.title < b.title ? -1 : (a.title == b.title ? 0 : +1);});
+	return list;
+};
+
+config.macros.sync.preProcessSyncableTiddlers = function()
+{
+	for(var t=0; t<currSync.syncList.length; t++) {
+		si = currSync.syncList[t];
+		var ti = si.syncTask.syncMachine.generateTiddlerInfo(si.tiddler);
+		si.serverUrl = ti.uri;
+	}
+};
+
+config.macros.sync.processSyncableTiddlers = function()
+{
+	for(var t=0; t<currSync.syncList.length; t++) {
+		si = currSync.syncList[t];
+		si.rowElement.style.backgroundColor = si.syncStatus.color;
+	}
+};
+
+config.macros.sync.createSyncTasks = function()
+{
+	currSync.syncTasks = [];
+	for(var t=0; t<currSync.syncList.length; t++) {
+		var si = currSync.syncList[t];
+		var r = null;
+		for(var st=0; st<currSync.syncTasks.length; st++) {
+			var cst = currSync.syncTasks[st];
+			if(si.serverType == cst.serverType && si.serverHost == cst.serverHost && si.serverWorkspace == cst.serverWorkspace)
+				r = cst;
+		}
+		if(r == null) {
+			si.syncTask = this.createSyncTask(si);
+			currSync.syncTasks.push(si.syncTask);
+		} else {
+			si.syncTask = r;
+			r.syncItems.push(si);
+		}
+	}
+};
+
+config.macros.sync.createSyncTask = function(syncItem)
+{
+	var st = {};
+	st.serverType = syncItem.serverType;
+	st.serverHost = syncItem.serverHost;
+	st.serverWorkspace = syncItem.serverWorkspace;
+	st.syncItems = [syncItem];
+	st.syncMachine = new SyncMachine(st.serverType,{
+		start: function() {
+			return this.openHost(st.serverHost,"openWorkspace");
+		},
+		openWorkspace: function() {
+			return this.openWorkspace(st.serverWorkspace,"getTiddlerList");
+		},
+		getTiddlerList: function() {
+			return this.getTiddlerList("gotTiddlerList");
+		},
+		gotTiddlerList: function(tiddlers) {
+			for(var t=0; t<st.syncItems.length; t++) {
+				var si = st.syncItems[t];
+				var f = tiddlers.findByField("title",si.title);
+				if(f !== null) {
+					if(tiddlers[f].fields['server.page.revision'] > si.tiddler.fields['server.page.revision']) {
+						si.syncStatus = config.macros.sync.syncStatusList[si.isTouched ? 'changedBoth' : 'changedServer'];
+					}
+				} else {
+					si.syncStatus = config.macros.sync.syncStatusList.notFound;
+				}
+				config.macros.sync.updateSyncStatus(si);
+			}
+		},
+		getTiddler: function(title) {
+			return this.getTiddler(title,"onGetTiddler");
+		},
+		onGetTiddler: function(tiddler) {
+			var syncItem = st.syncItems.findByField("title",tiddler.title);
+			if(syncItem !== null) {
+				syncItem = st.syncItems[syncItem];
+				store.saveTiddler(tiddler.title, tiddler.title, tiddler.text, tiddler.modifier, tiddler.modified, tiddler.tags, tiddler.fields, true, tiddler.created);
+				syncItem.syncStatus = config.macros.sync.syncStatusList.gotFromServer;
+				config.macros.sync.updateSyncStatus(syncItem);
+			}
+		},
+		putTiddler: function(tiddler) {
+			return this.putTiddler(tiddler,"onPutTiddler");
+		},
+		onPutTiddler: function(tiddler) {
+			var syncItem = st.syncItems.findByField("title",tiddler.title);
+			if(syncItem !== null) {
+				syncItem = st.syncItems[syncItem];
+				store.resetTiddler(tiddler.title);
+				syncItem.syncStatus = config.macros.sync.syncStatusList.putToServer;
+				config.macros.sync.updateSyncStatus(syncItem);
+			}
+		}
+	});
+	st.syncMachine.go();
+	return st;
+};
+
+config.macros.sync.updateSyncStatus = function(syncItem)
+{
+	var e = syncItem.colElements["status"];
+	removeChildren(e);
+	createTiddlyText(e,syncItem.syncStatus.text);
+	syncItem.rowElement.style.backgroundColor = syncItem.syncStatus.color;
+};
+
+config.macros.sync.doSync = function(e)
+{
+	var rowNames = ListView.getSelectedRows(currSync.listView);
+	for(var t=0; t<currSync.syncList.length; t++) {
+		var si = currSync.syncList[t];
+		if(rowNames.indexOf(si.title) != -1) {
+			config.macros.sync.doSyncItem(si);
+		}
+	}
+	return false;
+};
+
+config.macros.sync.doSyncItem = function(syncItem)
+{
+	var r = true;
+	var sl = config.macros.sync.syncStatusList;
+	switch(syncItem.syncStatus) {
+		case sl.changedServer:
+			r = syncItem.syncTask.syncMachine.go("getTiddler",syncItem.title);
+			break;
+		case sl.notFound:
+		case sl.changedLocally:
+		case sl.changedBoth:
+			r = syncItem.syncTask.syncMachine.go("putTiddler",syncItem.tiddler);
+			break;
+		default:
+			break;
+	}
+	if(r !== true)
+		displayMessage("Error in doSyncItem: " + r);
+};
+
+config.macros.sync.cancelSync = function()
+{
+	currSync = null;
+};
+
+function SyncMachine(serverType,steps)
+{
+	this.serverType = serverType;
+	this.adaptor = new config.adaptors[serverType];
+	this.steps = steps;
+}
+
+SyncMachine.prototype.go = function(step,varargs)
+{
+	if(!step)
+		step = "start";
+	var h = this.steps[step];
+	if(!h)
+		return null;
+	var a = [];
+	for(var t=1; t<arguments.length; t++)
+		a.push(arguments[t]);
+	var r = h.apply(this,a);
+	if(typeof r == "string")
+		this.invokeError(r);
+	return r;
+};
+
+SyncMachine.prototype.invokeError = function(message)
+{
+	if(this.steps.error)
+		this.steps.error(message);
+};
+
+SyncMachine.prototype.openHost = function(host,nextStep)
+{
+	var me = this;
+	return me.adaptor.openHost(host,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep);
+	});
+};
+
+SyncMachine.prototype.getWorkspaceList = function(nextStep)
+{
+	var me = this;
+	return me.adaptor.getWorkspaceList(null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,context.workspaces);
+	});
+};
+
+SyncMachine.prototype.openWorkspace = function(workspace,nextStep)
+{
+	var me = this;
+	return me.adaptor.openWorkspace(workspace,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep);
+	});
+};
+
+SyncMachine.prototype.getTiddlerList = function(nextStep)
+{
+	var me = this;
+	return me.adaptor.getTiddlerList(null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,context.tiddlers);
+	});
+};
+
+SyncMachine.prototype.generateTiddlerInfo = function(tiddler)
+{
+	return this.adaptor.generateTiddlerInfo(tiddler);
+};
+
+SyncMachine.prototype.getTiddler = function(title,nextStep)
+{
+	var me = this;
+	return me.adaptor.getTiddler(title,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,context.tiddler);
+	});
+};
+
+SyncMachine.prototype.putTiddler = function(tiddler,nextStep)
+{
+	var me = this;
+	return me.adaptor.putTiddler(tiddler,null,null,function(context) {
+		if(typeof context.status == "string")
+			me.invokeError(context.status);
+		else
+			me.go(nextStep,tiddler);
+	});
+};
+
+//--
+//-- Manager UI for groups of tiddlers
+//--
+
+config.macros.plugins.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var wizard = new Wizard();
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	listWrapper.setAttribute("refresh","macro");
+	listWrapper.setAttribute("macroName","plugins");
+	listWrapper.setAttribute("params",paramString);
+	this.refresh(listWrapper,paramString);
+};
+
+config.macros.plugins.refresh = function(listWrapper,params)
+{
+	var wizard = new Wizard(listWrapper);
+	var selectedRows = [];
+	ListView.forEachSelector(listWrapper,function(e,rowName) {
+			if(e.checked)
+				selectedRows.push(e.getAttribute("rowName"));
+		});
+	removeChildren(listWrapper);
+	params = params.parseParams("anon");
+	var plugins = installedPlugins.slice(0);
+	var t,tiddler,p;
+	var configTiddlers = store.getTaggedTiddlers("systemConfig");
+	for(t=0; t<configTiddlers.length; t++) {
+		tiddler = configTiddlers[t];
+		if(plugins.findByField("title",tiddler.title) == null) {
+			p = getPluginInfo(tiddler);
+			p.executed = false;
+			p.log.splice(0,0,this.skippedText);
+			plugins.push(p);
+		}
+	}
+	for(t=0; t<plugins.length; t++) {
+		p = plugins[t];
+		p.size = p.tiddler.text ? p.tiddler.text.length : 0;
+		p.forced = p.tiddler.isTagged("systemConfigForce");
+		p.disabled = p.tiddler.isTagged("systemConfigDisable");
+		p.Selected = selectedRows.indexOf(plugins[t].title) != -1;
+	}
+	if(plugins.length == 0) {
+		createTiddlyElement(listWrapper,"em",null,null,this.noPluginText);
+		wizard.setButtons([]);
+	} else {
+		var listView = ListView.create(listWrapper,plugins,this.listViewTemplate,this.onSelectCommand);
+		wizard.setValue("listView",listView);
+		wizard.setButtons([
+				{caption: config.macros.plugins.removeLabel, tooltip: config.macros.plugins.removePrompt, onClick:  config.macros.plugins.doRemoveTag},
+				{caption: config.macros.plugins.deleteLabel, tooltip: config.macros.plugins.deletePrompt, onClick:  config.macros.plugins.doDelete}
+			]);
+	}
+};
+
+config.macros.plugins.doRemoveTag = function(e)
+{
+	var wizard = new Wizard(this);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	if(rowNames.length == 0) {
+		alert(config.messages.nothingSelected);
+	} else {
+		for(var t=0; t<rowNames.length; t++)
+			store.setTiddlerTag(rowNames[t],false,"systemConfig");
+	}
+};
+
+config.macros.plugins.doDelete = function(e)
+{
+	var wizard = new Wizard(this);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	if(rowNames.length == 0) {
+		alert(config.messages.nothingSelected);
+	} else {
+		if(confirm(config.macros.plugins.confirmDeleteText.format([rowNames.join(", ")]))) {
+			for(t=0; t<rowNames.length; t++) {
+				store.removeTiddler(rowNames[t]);
+				story.closeTiddler(rowNames[t],true);
+			}
+		}
+	}
+};
+
+//--
+//-- Message area
+//--
+
+function getMessageDiv()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(!msgArea)
+		return null;
+	if(!msgArea.hasChildNodes())
+		createTiddlyButton(createTiddlyElement(msgArea,"div",null,"messageToolbar"),
+			config.messages.messageClose.text,
+			config.messages.messageClose.tooltip,
+			clearMessage);
+	msgArea.style.display = "block";
+	return createTiddlyElement(msgArea,"div");
+}
+
+function displayMessage(text,linkText)
+{
+	var e = getMessageDiv();
+	if(!e) {
+		alert(text);
+		return;
+	}
+	if(linkText) {
+		var link = createTiddlyElement(e,"a",null,null,text);
+		link.href = linkText;
+		link.target = "_blank";
+	} else {
+		e.appendChild(document.createTextNode(text));
+	}
+}
+
+function clearMessage()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(msgArea) {
+		removeChildren(msgArea);
+		msgArea.style.display = "none";
+	}
+	return false;
+}
+
+//--
+//-- Refresh mechanism
+//--
+
+config.refreshers = {
+	link: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddlyLink");
+		refreshTiddlyLink(e,title);
+		return true;
+		},
+	
+	tiddler: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var template = e.getAttribute("template");
+		if(changeList && changeList.indexOf(title) != -1 && !story.isDirty(title))
+			story.refreshTiddler(title,template,true);
+		else
+			refreshElements(e,changeList);
+		return true;
+		},
+
+	content: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var force = e.getAttribute("force");
+		if(force != null || changeList == null || changeList.indexOf(title) != -1) {
+			removeChildren(e);
+			wikify(store.getTiddlerText(title,title),e,null);
+			return true;
+		} else
+			return false;
+		},
+
+	macro: function(e,changeList)
+		{
+		var macro = e.getAttribute("macroName");
+		var params = e.getAttribute("params");
+		if(macro)
+			macro = config.macros[macro];
+		if(macro && macro.refresh)
+			macro.refresh(e,params);
+		return true;
+		}
+};
+
+function refreshElements(root,changeList)
+{
+	var nodes = root.childNodes;
+	for(var c=0; c<nodes.length; c++) {
+		var e = nodes[c], type = null;
+		if(e.getAttribute  && (e.tagName ? e.tagName != "IFRAME" : true))
+			type = e.getAttribute("refresh");
+		var refresher = config.refreshers[type];
+		var refreshed = false;
+		if(refresher != undefined)
+			refreshed = refresher(e,changeList);
+		if(e.hasChildNodes() && !refreshed)
+			refreshElements(e,changeList);
+	}
+}
+
+function applyHtmlMacros(root,tiddler)
+{
+	var e = root.firstChild;
+	while(e) {
+		var nextChild = e.nextSibling;
+		if(e.getAttribute) {
+			var macro = e.getAttribute("macro");
+			if(macro) {
+				var params = "";
+				var p = macro.indexOf(" ");
+				if(p != -1) {
+					params = macro.substr(p+1);
+					macro = macro.substr(0,p);
+				}
+				invokeMacro(e,macro,params,null,tiddler);
+			}
+		}
+		if(e.hasChildNodes())
+			applyHtmlMacros(e,tiddler);
+		e = nextChild;
+	}
+}
+
+function refreshPageTemplate(title)
+{
+	var stash = createTiddlyElement(document.body,"div");
+	stash.style.display = "none";
+	var display = document.getElementById("tiddlerDisplay");
+	var nodes,t;
+	if(display) {
+		nodes = display.childNodes;
+		for(t=nodes.length-1; t>=0; t--)
+			stash.appendChild(nodes[t]);
+	}
+	var wrapper = document.getElementById("contentWrapper");
+	if(!title)
+		title = "PageTemplate";
+	var html = store.getRecursiveTiddlerText(title,null,10);
+	wrapper.innerHTML = html;
+	applyHtmlMacros(wrapper);
+	refreshElements(wrapper);
+	display = document.getElementById("tiddlerDisplay");
+	removeChildren(display);
+	if(!display)
+		display = createTiddlyElement(wrapper,"div","tiddlerDisplay");
+	nodes = stash.childNodes;
+	for(t=nodes.length-1; t>=0; t--)
+		display.appendChild(nodes[t]);
+	removeNode(stash);
+}
+
+function refreshDisplay(hint)
+{
+	if(typeof hint == "string")
+		hint = [hint];
+	var e = document.getElementById("contentWrapper");
+	refreshElements(e,hint);
+	if(backstage.isPanelVisible()) {
+		e = document.getElementById("backstage");
+		refreshElements(e,hint);
+	}
+}
+
+function refreshPageTitle()
+{
+	document.title = getPageTitle();
+}
+
+function getPageTitle()
+{
+	var st = wikifyPlain("SiteTitle");
+	var ss = wikifyPlain("SiteSubtitle");
+	return st + ((st == "" || ss == "") ? "" : " - ") + ss;
+}
+
+function refreshStyles(title,doc)
+{
+	if(!doc)
+		doc = document;
+	setStylesheet(title == null ? "" : store.getRecursiveTiddlerText(title,"",10),title,doc);
+}
+
+function refreshColorPalette(title)
+{
+	if(!startingUp)
+		refreshAll();
+}
+
+function refreshAll()
+{
+	refreshPageTemplate();
+	refreshDisplay();
+	refreshStyles("StyleSheetLayout");
+	refreshStyles("StyleSheetColors");
+	refreshStyles("StyleSheet");
+	refreshStyles("StyleSheetPrint");
+}
+
+//--
+//-- Options cookie stuff
+//--
+
+config.optionHandlers = {
+	'txt': {
+		get: function(name) {return encodeCookie(config.options[name].toString());},
+		set: function(name,value) {config.options[name] = decodeCookie(value);}
+	},
+	'chk': {
+		get: function(name) {return config.options[name] ? "true" : "false";},
+		set: function(name,value) {config.options[name] = value == "true";}
+	}
+};
+
+function loadOptionsCookie()
+{
+	if(safeMode)
+		return;
+	var cookies = document.cookie.split(";");
+	for(var c=0; c<cookies.length; c++) {
+		var p = cookies[c].indexOf("=");
+		if(p != -1) {
+			var name = cookies[c].substr(0,p).trim();
+			var value = cookies[c].substr(p+1).trim();
+			var optType = name.substr(0,3);
+			if(config.optionHandlers[optType] && config.optionHandlers[optType].set)
+				config.optionHandlers[optType].set(name,value);
+		}
+	}
+}
+
+function saveOptionCookie(name)
+{
+	if(safeMode)
+		return;
+	var c = name + "=";
+	var optType = name.substr(0,3);
+	if(config.optionHandlers[optType] && config.optionHandlers[optType].get)
+		c += config.optionHandlers[optType].get(name);
+	c += "; expires=Fri, 1 Jan 2038 12:00:00 UTC; path=/";
+	document.cookie = c;
+}
+
+function encodeCookie(s)
+{
+	return escape(manualConvertUnicodeToUTF8(s));
+}
+
+function decodeCookie(s)
+{
+	s = unescape(s);
+	var re = /&#[0-9]{1,5};/g;
+	return s.replace(re,function($0) {return String.fromCharCode(eval($0.replace(/[&#;]/g,"")));});
+}
+
+//--
+//-- Saving
+//--
+
+var saveUsingSafari = false;
+
+var startSaveArea = '<div id="' + 'storeArea">'; // Split up into two so that indexOf() of this source doesn't find it
+var endSaveArea = '</d' + 'iv>';
+
+// If there are unsaved changes, force the user to confirm before exitting
+function confirmExit()
+{
+	hadConfirmExit = true;
+	if((store && store.isDirty && store.isDirty()) || (story && story.areAnyDirty && story.areAnyDirty()))
+		return config.messages.confirmExit;
+}
+
+// Give the user a chance to save changes before exitting
+function checkUnsavedChanges()
+{
+	if(store && store.isDirty && store.isDirty() && window.hadConfirmExit === false) {
+		if(confirm(config.messages.unsavedChangesWarning))
+			saveChanges();
+	}
+}
+
+function updateLanguageAttribute(s)
+{
+	if(config.locale) {
+		var mRE = /(<html(?:.*?)?)(?: xml:lang\="([a-z]+)")?(?: lang\="([a-z]+)")?>/;
+		var m = mRE.exec(s);
+		if(m) {
+			var t = m[1];
+			if(m[2])
+				t += ' xml:lang="' + config.locale + '"';
+			if(m[3])
+				t += ' lang="' + config.locale + '"';
+			t += ">";
+			s = s.substr(0,m.index) + t + s.substr(m.index+m[0].length);
+		}
+	}
+	return s;
+}
+
+function updateMarkupBlock(s,blockName,tiddlerName)
+{
+	return s.replaceChunk(
+			"<!--%0-START-->".format([blockName]),
+			"<!--%0-END-->".format([blockName]),
+			"\n" + store.getRecursiveTiddlerText(tiddlerName,"") + "\n");
+}
+
+function updateOriginal(original,posDiv)
+{
+	if(!posDiv)
+		posDiv = locateStoreArea(original);
+	if(!posDiv) {
+		alert(config.messages.invalidFileError.format([localPath]));
+		return null;
+	}
+	var revised = original.substr(0,posDiv[0] + startSaveArea.length) + "\n" +
+				convertUnicodeToUTF8(store.allTiddlersAsHtml()) + "\n" +
+				original.substr(posDiv[1]);
+	var newSiteTitle = convertUnicodeToUTF8(getPageTitle()).htmlEncode();
+	revised = revised.replaceChunk("<title"+">","</title"+">"," " + newSiteTitle + " ");
+	revised = updateLanguageAttribute(revised);
+	revised = updateMarkupBlock(revised,"PRE-HEAD","MarkupPreHead");
+	revised = updateMarkupBlock(revised,"POST-HEAD","MarkupPostHead");
+	revised = updateMarkupBlock(revised,"PRE-BODY","MarkupPreBody");
+	revised = updateMarkupBlock(revised,"POST-SCRIPT","MarkupPostBody");
+	return revised;
+}
+
+function locateStoreArea(original)
+{
+	// Locate the storeArea div's
+	var posOpeningDiv = original.indexOf(startSaveArea);
+	var limitClosingDiv = original.indexOf("<"+"!--POST-STOREAREA--"+">");
+	if(limitClosingDiv == -1)
+		limitClosingDiv = original.indexOf("<"+"!--POST-BODY-START--"+">");
+	var posClosingDiv = original.lastIndexOf(endSaveArea,limitClosingDiv == -1 ? original.length : limitClosingDiv);
+	return (posOpeningDiv != -1 && posClosingDiv != -1) ? [posOpeningDiv,posClosingDiv] : null;
+}
+
+function autoSaveChanges(onlyIfDirty,tiddlers)
+{
+	if(config.options.chkAutoSave)
+		saveChanges(onlyIfDirty,tiddlers);
+}
+
+// Save this tiddlywiki with the pending changes
+function saveChanges(onlyIfDirty,tiddlers)
+{
+	if(onlyIfDirty && !store.isDirty())
+		return;
+	clearMessage();
+	// Get the URL of the document
+	var originalPath = document.location.toString();
+	// Check we were loaded from a file URL
+	if(originalPath.substr(0,5) != "file:") {
+		alert(config.messages.notFileUrlError);
+		if(store.tiddlerExists(config.messages.saveInstructions))
+			story.displayTiddler(null,config.messages.saveInstructions);
+		return;
+	}
+	var localPath = getLocalPath(originalPath);
+	// Load the original file
+	var original = loadFile(localPath);
+	if(original == null) {
+		alert(config.messages.cantSaveError);
+		if(store.tiddlerExists(config.messages.saveInstructions))
+			story.displayTiddler(null,config.messages.saveInstructions);
+		return;
+	}
+	// Locate the storeArea div's
+	var posDiv = locateStoreArea(original);
+	if(!posDiv) {
+		alert(config.messages.invalidFileError.format([localPath]));
+		return;
+	}
+	saveBackup(localPath,original);
+	saveRss(localPath);
+	saveEmpty(localPath,original,posDiv);
+	saveMain(localPath,original,posDiv);
+}
+
+function saveBackup(localPath,original)
+{
+	// Save the backup
+	if(config.options.chkSaveBackups) {
+		var backupPath = getBackupPath(localPath);
+		var backup = config.browser.isIE ? ieCopyFile(backupPath,localPath) : saveFile(backupPath,original);
+		if(backup)
+			displayMessage(config.messages.backupSaved,"file://" + backupPath);
+		else
+			alert(config.messages.backupFailed);
+	}
+}
+
+function saveRss(localPath)
+{
+	if(config.options.chkGenerateAnRssFeed) {
+		var rssPath = localPath.substr(0,localPath.lastIndexOf(".")) + ".xml";
+		var rssSave = saveFile(rssPath,convertUnicodeToUTF8(generateRss()));
+		if(rssSave)
+			displayMessage(config.messages.rssSaved,"file://" + rssPath);
+		else
+			alert(config.messages.rssFailed);
+	}
+}
+
+function saveEmpty(localPath,original,posDiv)
+{
+	if(config.options.chkSaveEmptyTemplate) {
+		var emptyPath,p;
+		if((p = localPath.lastIndexOf("/")) != -1)
+			emptyPath = localPath.substr(0,p) + "/empty.html";
+		else if((p = localPath.lastIndexOf("\\")) != -1)
+			emptyPath = localPath.substr(0,p) + "\\empty.html";
+		else
+			emptyPath = localPath + ".empty.html";
+		var empty = original.substr(0,posDiv[0] + startSaveArea.length) + original.substr(posDiv[1]);
+		var emptySave = saveFile(emptyPath,empty);
+		if(emptySave)
+			displayMessage(config.messages.emptySaved,"file://" + emptyPath);
+		else
+			alert(config.messages.emptyFailed);
+	}
+}
+
+function saveMain(localPath,original,posDiv)
+{
+	var save;
+	try {
+		var revised = updateOriginal(original,posDiv);
+		save = saveFile(localPath,revised);
+	} catch (ex) {
+		showException(ex);
+	}
+	if(save) {
+		displayMessage(config.messages.mainSaved,"file://" + localPath);
+		store.setDirty(false);
+	} else {
+		alert(config.messages.mainFailed);
+	}
+}
+
+function getLocalPath(origPath)
+{
+	var originalPath = convertUriToUTF8(origPath,config.options.txtFileSystemCharSet);
+	// Remove any location or query part of the URL
+	var argPos = originalPath.indexOf("?");
+	if(argPos != -1)
+		originalPath = originalPath.substr(0,argPos);
+	var hashPos = originalPath.indexOf("#");
+	if(hashPos != -1)
+		originalPath = originalPath.substr(0,hashPos);
+	// Convert file://localhost/ to file:///
+	if(originalPath.indexOf("file://localhost/") == 0)
+		originalPath = "file://" + originalPath.substr(16);
+	// Convert to a native file format
+	var localPath;
+	if(originalPath.charAt(9) == ":") // pc local file
+		localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file://///") == 0) // FireFox pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file:///") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(7));
+	else if(originalPath.indexOf("file:/") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(5));
+	else // pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\\");
+	return localPath;
+}
+
+function getBackupPath(localPath)
+{
+	var backSlash = true;
+	var dirPathPos = localPath.lastIndexOf("\\");
+	if(dirPathPos == -1) {
+		dirPathPos = localPath.lastIndexOf("/");
+		backSlash = false;
+	}
+	var backupFolder = config.options.txtBackupFolder;
+	if(!backupFolder || backupFolder == "")
+		backupFolder = ".";
+	var backupPath = localPath.substr(0,dirPathPos) + (backSlash ? "\\" : "/") + backupFolder + localPath.substr(dirPathPos);
+	backupPath = backupPath.substr(0,backupPath.lastIndexOf(".")) + "." + (new Date()).convertToYYYYMMDDHHMMSSMMM() + ".html";
+	return backupPath;
+}
+
+function generateRss()
+{
+	var s = [];
+	var d = new Date();
+	var u = store.getTiddlerText("SiteUrl");
+	// Assemble the header
+	s.push("<" + "?xml version=\"1.0\"?" + ">");
+	s.push("<rss version=\"2.0\">");
+	s.push("<channel>");
+	s.push("<title" + ">" + wikifyPlain("SiteTitle").htmlEncode() + "</title" + ">");
+	if(u)
+		s.push("<link>" + u.htmlEncode() + "</link>");
+	s.push("<description>" + wikifyPlain("SiteSubtitle").htmlEncode() + "</description>");
+	s.push("<language>en-us</language>");
+	s.push("<copyright>Copyright " + d.getFullYear() + " " + config.options.txtUserName.htmlEncode() + "</copyright>");
+	s.push("<pubDate>" + d.toGMTString() + "</pubDate>");
+	s.push("<lastBuildDate>" + d.toGMTString() + "</lastBuildDate>");
+	s.push("<docs>http://blogs.law.harvard.edu/tech/rss</docs>");
+	s.push("<generator>TiddlyWiki " + version.major + "." + version.minor + "." + version.revision + "</generator>");
+	// The body
+	var tiddlers = store.getTiddlers("modified","excludeLists");
+	var n = config.numRssItems > tiddlers.length ? 0 : tiddlers.length-config.numRssItems;
+	for (var t=tiddlers.length-1; t>=n; t--)
+		s.push(tiddlers[t].saveToRss(u));
+	// And footer
+	s.push("</channel>");
+	s.push("</rss>");
+	// Save it all
+	return s.join("\n");
+}
+
+//--
+//-- Filesystem code
+//--
+
+function convertUTF8ToUnicode(u)
+{
+	if(window.netscape == undefined)
+		return manualConvertUTF8ToUnicode(u);
+	else
+		return mozConvertUTF8ToUnicode(u);
+}
+
+function manualConvertUTF8ToUnicode(utf)
+{
+	var uni = utf;
+	var src = 0;
+	var dst = 0;
+	var b1, b2, b3;
+	var c;
+	while(src < utf.length) {
+		b1 = utf.charCodeAt(src++);
+		if(b1 < 0x80) {
+			dst++;
+		} else if(b1 < 0xE0) {
+			b2 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0x1F) << 6) | (b2 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+		} else {
+			b2 = utf.charCodeAt(src++);
+			b3 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0xF) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+		}
+	}
+	return uni;
+}
+
+function mozConvertUTF8ToUnicode(u)
+{
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+	} catch(ex) {
+		return manualConvertUTF8ToUnicode(u);
+	} // fallback
+	var s = converter.ConvertToUnicode(u);
+	var fin = converter.Finish();
+	return (fin.length > 0) ? s+fin : s;
+}
+
+function convertUnicodeToUTF8(s)
+{
+	if(window.netscape == undefined)
+		return manualConvertUnicodeToUTF8(s);
+	else
+		return mozConvertUnicodeToUTF8(s);
+}
+
+function manualConvertUnicodeToUTF8(s)
+{
+	var re = /[^\u0000-\u007F]/g ;
+	return s.replace(re,function($0) {return "&#" + $0.charCodeAt(0).toString() + ";";});
+}
+
+function mozConvertUnicodeToUTF8(s)
+{
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+	} catch(ex) {
+		return manualConvertUnicodeToUTF8(s);
+	} // fallback
+	var u = converter.ConvertFromUnicode(s);
+	var fin = converter.Finish();
+	if(fin.length > 0)
+		return u + fin;
+	else
+		return u;
+}
+
+function convertUriToUTF8(uri,charSet)
+{
+	if(window.netscape == undefined || charSet == undefined || charSet == "")
+		return uri;
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/utf8converterservice;1"].getService(Components.interfaces.nsIUTF8ConverterService);
+	} catch(ex) {
+		return uri;
+	}
+	return converter.convertURISpecToUTF8(uri,charSet);
+}
+
+function saveFile(fileUrl,content)
+{
+	var r = null;
+	if(!r)
+		r = mozillaSaveFile(fileUrl,content);
+	if(!r)
+		r = ieSaveFile(fileUrl,content);
+	if(!r)
+		r = javaSaveFile(fileUrl,content);
+	return r;
+}
+
+function loadFile(fileUrl)
+{
+	var r = null;
+	if((r == null) || (r == false))
+		r = mozillaLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = ieLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = javaLoadFile(fileUrl);
+	return r;
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function ieSaveFile(filePath,content)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+	} catch(ex) {
+		return null;
+	}
+	var file = fso.OpenTextFile(filePath,2,-1,0);
+	file.Write(content);
+	file.Close();
+	return true;
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function ieLoadFile(filePath)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		var file = fso.OpenTextFile(filePath,1);
+		var content = file.ReadAll();
+		file.Close();
+	} catch(ex) {
+		return null;
+	}
+	return content;
+}
+
+function ieCopyFile(dest,source)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		fso.GetFile(source).Copy(dest);
+	} catch(ex) {
+		return false;
+	}
+	return true;
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function mozillaSaveFile(filePath,content)
+{
+	if(window.Components) {
+		try {
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if(!file.exists())
+				file.create(0,0664);
+			var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+			out.init(file,0x20|0x02,00004,null);
+			out.write(content,content.length);
+			out.flush();
+			out.close();
+			return true;
+		} catch(ex) {
+			return false;
+		}
+	}
+	return null;
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function mozillaLoadFile(filePath)
+{
+	if(window.Components) {
+		try {
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if(!file.exists())
+				return null;
+			var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+			inputStream.init(file,0x01,00004,null);
+			var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+			sInputStream.init(inputStream);
+			return sInputStream.read(sInputStream.available());
+		} catch(ex) {
+			return false;
+		}
+	}
+	return null;
+}
+
+function javaUrlToFilename(url)
+{
+	var f = "//localhost";
+	if(url.indexOf(f) == 0)
+		return url.substring(f.length);
+	var i = url.indexOf(":");
+	if(i > 0)
+		return url.substring(i-1);
+	return url;
+}
+
+function javaSaveFile(filePath,content)
+{
+	try {
+		if(document.applets["TiddlySaver"])
+			return document.applets["TiddlySaver"].saveFile(javaUrlToFilename(filePath),"UTF-8",content);
+	} catch(ex) {
+	}
+	try {
+		var s = new java.io.PrintStream(new java.io.FileOutputStream(javaUrlToFilename(filePath)));
+		s.print(content);
+		s.close();
+	} catch(ex) {
+		return null;
+	}
+	return true;
+}
+
+function javaLoadFile(filePath)
+{
+	try {
+		if(document.applets["TiddlySaver"])
+			return String(document.applets["TiddlySaver"].loadFile(javaUrlToFilename(filePath),"UTF-8"));
+	} catch(ex) {
+	}
+	var content = [];
+	try {
+		var r = new java.io.BufferedReader(new java.io.FileReader(javaUrlToFilename(filePath)));
+		var line;
+		while((line = r.readLine()) != null)
+			content.push(new String(line));
+		r.close();
+	} catch(ex) {
+		return null;
+	}
+	return content.join("\n");
+}
+
+//--
+//-- Server adaptor for talking to static files
+//--
+
+function FileAdaptor()
+{
+	this.host = null;
+	this.store = null;
+	return this;
+}
+
+FileAdaptor.NotLoadedError = "TiddlyWiki file has not been loaded";
+FileAdaptor.serverType = 'file';
+
+// Open the specified host/server
+FileAdaptor.prototype.openHost = function(host,context,userParams,callback)
+{
+	this.host = host;
+	if(!context)
+		context = {};
+	context.adaptor = this;
+	context.callback = callback;
+	context.userParams = userParams;
+	var ret = loadRemoteFile(host,FileAdaptor.openHostCallback,context);
+	return typeof(ret) == "string" ? ret : true;
+};
+
+FileAdaptor.openHostCallback = function(status,context,responseText,url,xhr)
+{
+	var adaptor = context.adaptor;
+	context.status = status;
+	if(!status) {
+		context.statusText = "Error reading file: " + xhr.statusText;
+	} else {
+		// Load the content into a TiddlyWiki() object
+		adaptor.store = new TiddlyWiki();
+		if(!adaptor.store.importTiddlyWiki(responseText))
+			context.statusText = config.messages.invalidFileError.format([url]);
+	}
+	context.callback(context,context.userParams);
+};
+
+// Gets the list of workspaces on a given server
+FileAdaptor.prototype.getWorkspaceList = function(context,userParams,callback)
+{
+	if(!context)
+		context = {};
+	context.workspaces = [{title:"(default)"}];
+	context.status = true;
+	window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
+// Open the specified workspace
+FileAdaptor.prototype.openWorkspace = function(workspace,context,userParams,callback)
+{
+	if(!context)
+		context = {};
+	context.status = true;
+	window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
+// Gets the list of tiddlers within a given workspace
+FileAdaptor.prototype.getTiddlerList = function(context,userParams,callback)
+{
+	if(!this.store)
+		return FileAdaptor.NotLoadedError;
+	if(!context)
+		context = {};
+	context.tiddlers = [];
+	this.store.forEachTiddler(function(title,tiddler)
+		{
+		var t = new Tiddler(title);
+		t.text = tiddler.text;
+		t.modified = tiddler.modified;
+		t.modifier = tiddler.modifier;
+		t.fields['server.page.revision'] = tiddler.modified.convertToYYYYMMDDHHMM();
+		t.tags = tiddler.tags;
+		context.tiddlers.push(t);
+		});
+	context.status = true;
+	window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
+FileAdaptor.prototype.generateTiddlerInfo = function(tiddler)
+{
+	var info = {};
+	info.uri = tiddler.fields['server.host'] + "#" + tiddler.title;
+	return info;
+};
+
+// Retrieves a tiddler from a given workspace on a given server
+FileAdaptor.prototype.getTiddler = function(title,context,userParams,callback)
+{
+	if(!this.store)
+		return FileAdaptor.NotLoadedError;
+	if(!context)
+		context = {};
+	context.tiddler = this.store.fetchTiddler(title);
+	if(context.tiddler) {
+		context.tiddler.fields['server.type'] = FileAdaptor.serverType;
+		context.tiddler.fields['server.host'] = this.host;
+		context.tiddler.fields['server.page.revision'] = context.tiddler.modified.convertToYYYYMMDDHHMM();
+	}
+	context.status = true;
+	if(context.allowSynchronous) {
+		context.isSynchronous = true;
+		callback(context,userParams);
+	} else {
+		window.setTimeout(function() {callback(context,userParams);},10);
+	}
+	return true;
+};
+
+FileAdaptor.prototype.close = function()
+{
+	delete this.store;
+	this.store = null;
+};
+
+config.adaptors[FileAdaptor.serverType] = FileAdaptor;
+
+//--
+//-- Remote HTTP requests
+//--
+
+function loadRemoteFile(url,callback,params)
+{
+	return doHttp("GET",url,null,null,null,null,callback,params,null);
+}
+
+// HTTP status codes
+var httpStatus = {
+	OK: 200,
+	ContentCreated: 201,
+	NoContent: 204,
+	Unauthorized: 401,
+	Forbidden: 403,
+	NotFound: 404,
+	MethodNotAllowed: 405
+};
+
+function doHttp(type,url,data,contentType,username,password,callback,params,headers)
+{
+	// Get an xhr object
+	var x = getXMLHttpRequest();
+	if(!x)
+		return "Can't create XMLHttpRequest object";
+	// Install callback
+	x.onreadystatechange = function() {
+		if (x.readyState == 4 && callback && (x.status !== undefined)) {
+			if([0, httpStatus.OK, httpStatus.ContentCreated, httpStatus.NoContent].contains(x.status))
+				callback(true,params,x.responseText,url,x);
+			else
+				callback(false,params,null,url,x);
+			x.onreadystatechange = function(){};
+			x = null;
+		}
+	};
+	// Send request
+	if(window.Components && window.netscape && window.netscape.security && document.location.protocol.indexOf("http") == -1)
+		window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+	try {
+		url = url + (url.indexOf("?") < 0 ? "?" : "&") + "nocache=" + Math.random();
+		x.open(type,url,true,username,password);
+		if (data)
+			x.setRequestHeader("Content-Type", contentType ? contentType : "application/x-www-form-urlencoded");
+		if (x.overrideMimeType)
+			x.setRequestHeader("Connection", "close");
+		if(headers) {
+			for(n in headers)
+				x.setRequestHeader(n,headers[n]);
+		}
+		x.setRequestHeader("X-Requested-With", "TiddlyWiki " + version.major + "." + version.minor + "." + version.revision + (version.beta ? " (beta " + version.beta + ")" : ""));
+		x.send(data);
+	} catch (ex) {
+		return exceptionText(ex);
+	}
+	return x;
+}
+
+function getXMLHttpRequest()
+{
+	try {
+		var x = new XMLHttpRequest(); // Modern
+	} catch(ex) {
+		try {
+			x = new ActiveXObject("Msxml2.XMLHTTP"); // IE 6
+		} catch (ex2) {
+			return null;
+		}
+	}
+	return x;
+}
+
+//--
+//-- TiddlyWiki-specific utility functions
+//--
+
+function createTiddlyButton(theParent,theText,theTooltip,theAction,theClass,theId,theAccessKey)
+{
+	var theButton = document.createElement("a");
+	if(theAction) {
+		theButton.onclick = theAction;
+		theButton.setAttribute("href","javascript:;");
+	}
+	if(theTooltip)
+		theButton.setAttribute("title",theTooltip);
+	if(theText)
+		theButton.appendChild(document.createTextNode(theText));
+	if(theClass)
+		theButton.className = theClass;
+	else
+		theButton.className = "button";
+	if(theId)
+		theButton.id = theId;
+	if(theParent)
+		theParent.appendChild(theButton);
+	if(theAccessKey)
+		theButton.setAttribute("accessKey",theAccessKey);
+	return theButton;
+}
+
+function createTiddlyLink(place,title,includeText,theClass,isStatic,linkedFromTiddler,noToggle)
+{
+	var text = includeText ? title : null;
+	var i = getTiddlyLinkInfo(title,theClass);
+	var btn = isStatic ? createExternalLink(place,store.getTiddlerText("SiteUrl",null) + "#" + title) : createTiddlyButton(place,text,i.subTitle,onClickTiddlerLink,i.classes);
+	btn.setAttribute("refresh","link");
+	btn.setAttribute("tiddlyLink",title);
+	if(noToggle)
+		btn.setAttribute("noToggle","true");
+	if(linkedFromTiddler) {
+		var fields = linkedFromTiddler.getInheritedFields();
+		if(fields)
+			btn.setAttribute("tiddlyFields",fields);
+	}
+	return btn;
+}
+
+function refreshTiddlyLink(e,title)
+{
+	var i = getTiddlyLinkInfo(title,e.className);
+	e.className = i.classes;
+	e.title = i.subTitle;
+}
+
+function getTiddlyLinkInfo(title,currClasses)
+{
+	var classes = currClasses ? currClasses.split(" ") : [];
+	classes.pushUnique("tiddlyLink");
+	var tiddler = store.fetchTiddler(title);
+	var subTitle;
+	if(tiddler) {
+		subTitle = tiddler.getSubtitle();
+		classes.pushUnique("tiddlyLinkExisting");
+		classes.remove("tiddlyLinkNonExisting");
+		classes.remove("shadow");
+	} else {
+		classes.remove("tiddlyLinkExisting");
+		classes.pushUnique("tiddlyLinkNonExisting");
+		if(store.isShadowTiddler(title)) {
+			subTitle = config.messages.shadowedTiddlerToolTip.format([title]);
+			classes.pushUnique("shadow");
+		} else {
+			subTitle = config.messages.undefinedTiddlerToolTip.format([title]);
+			classes.remove("shadow");
+		}
+	}
+	if(config.annotations[title])
+		subTitle = config.annotations[title];
+	return {classes: classes.join(" "),subTitle: subTitle};
+}
+
+function createExternalLink(place,url)
+{
+	var theLink = document.createElement("a");
+	theLink.className = "externalLink";
+	theLink.href = url;
+	theLink.title = config.messages.externalLinkTooltip.format([url]);
+	if(config.options.chkOpenInNewWindow)
+		theLink.target = "_blank";
+	place.appendChild(theLink);
+	return theLink;
+}
+
+// Event handler for clicking on a tiddly link
+function onClickTiddlerLink(e)
+{
+	if(!e) e = window.event;
+	var theTarget = resolveTarget(e);
+	var theLink = theTarget;
+	var title = null;
+	var fields = null;
+	var noToggle = null;
+	do {
+		title = theLink.getAttribute("tiddlyLink");
+		fields = theLink.getAttribute("tiddlyFields");
+		noToggle = theLink.getAttribute("noToggle");
+		theLink = theLink.parentNode;
+	} while(title == null && theLink != null);
+	if(!fields && !store.isShadowTiddler(title))
+		fields = String.encodeHashMap(config.defaultCustomFields);
+	if(title) {
+		var toggling = e.metaKey || e.ctrlKey;
+		if(config.options.chkToggleLinks)
+			toggling = !toggling;
+		if(noToggle)
+			toggling = false;
+		story.displayTiddler(theTarget,title,null,true,null,fields,toggling);
+	}
+	clearMessage();
+	return false;
+}
+
+// Create a button for a tag with a popup listing all the tiddlers that it tags
+function createTagButton(place,tag,excludeTiddler)
+{
+	var theTag = createTiddlyButton(place,tag,config.views.wikified.tag.tooltip.format([tag]),onClickTag);
+	theTag.setAttribute("tag",tag);
+	if(excludeTiddler)
+		theTag.setAttribute("tiddler",excludeTiddler);
+	return theTag;
+}
+
+// Event handler for clicking on a tiddler tag
+function onClickTag(e)
+{
+	if(!e) var e = window.event;
+	var theTarget = resolveTarget(e);
+	var popup = Popup.create(this);
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(popup && tag) {
+		var tagged = store.getTaggedTiddlers(tag);
+		var titles = [];
+		var li,r;
+		for(r=0;r<tagged.length;r++) {
+			if(tagged[r].title != title)
+				titles.push(tagged[r].title);
+		}
+		var lingo = config.views.wikified.tag;
+		if(titles.length > 0) {
+			var openAll = createTiddlyButton(createTiddlyElement(popup,"li"),lingo.openAllText.format([tag]),lingo.openAllTooltip,onClickTagOpenAll);
+			openAll.setAttribute("tag",tag);
+			createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+			for(r=0; r<titles.length; r++) {
+				createTiddlyLink(createTiddlyElement(popup,"li"),titles[r],true);
+			}
+		} else {
+			createTiddlyText(createTiddlyElement(popup,"li",null,"disabled"),lingo.popupNone.format([tag]));
+		}
+		createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+		var h = createTiddlyLink(createTiddlyElement(popup,"li"),tag,false);
+		createTiddlyText(h,lingo.openTag.format([tag]));
+	}
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+// Event handler for 'open all' on a tiddler popup
+function onClickTagOpenAll(e)
+{
+	if(!e) var e = window.event;
+	var tag = this.getAttribute("tag");
+	var tagged = store.getTaggedTiddlers(tag);
+	var titles = [];
+	for(var t=0; t<tagged.length; t++)
+		titles.push(tagged[t].title);
+	story.displayTiddlers(this,titles);
+	return false;
+}
+
+function onClickError(e)
+{
+	if(!e) var e = window.event;
+	var popup = Popup.create(this);
+	var lines = this.getAttribute("errorText").split("\n");
+	for(var t=0; t<lines.length; t++)
+		createTiddlyElement(popup,"li",null,null,lines[t]);
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+function createTiddlyDropDown(place,onchange,options,defaultValue)
+{
+	var sel = createTiddlyElement(place,"select");
+	sel.onchange = onchange;
+	for(var t=0; t<options.length; t++) {
+		var e = createTiddlyElement(sel,"option",null,null,options[t].caption);
+		e.value = options[t].name;
+		if(options[t].name == defaultValue)
+			e.selected = true;
+	}
+	return sel;
+}
+
+function createTiddlyPopup(place,caption,tooltip,tiddler)
+{
+	if(tiddler.text) {
+		createTiddlyLink(place,caption,true);
+		var btn = createTiddlyButton(place,glyph("downArrow"),tooltip,onClickTiddlyPopup,"tiddlerPopupButton");
+		btn.tiddler = tiddler;
+	} else {
+		createTiddlyText(place,caption);
+	}
+}
+
+function onClickTiddlyPopup(e)
+{
+	if(!e) var e = window.event;
+	var tiddler = this.tiddler;
+	if(tiddler.text) {
+		var popup = Popup.create(this,"div","popupTiddler");
+		wikify(tiddler.text,popup,null,tiddler);
+		Popup.show();
+	}
+	if(e) e.cancelBubble = true;
+	if(e && e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+function createTiddlyError(place,title,text)
+{
+	var btn = createTiddlyButton(place,title,null,onClickError,"errorButton");
+	if(text) btn.setAttribute("errorText",text);
+}
+
+function merge(dst,src,preserveExisting)
+{
+	for(p in src) {
+		if(!preserveExisting || dst[p] === undefined)
+			dst[p] = src[p];
+	}
+	return dst;
+}
+
+// Returns a string containing the description of an exception, optionally prepended by a message
+function exceptionText(e,message)
+{
+	var s = e.description ? e.description : e.toString();
+	return message ? "%0:\n%1".format([message,s]) : s;
+}
+
+// Displays an alert of an exception description with optional message
+function showException(e,message)
+{
+	alert(exceptionText(e,message));
+}
+
+function alertAndThrow(m)
+{
+	alert(m);
+	throw(m);
+}
+
+function glyph(name)
+{
+	var g = config.glyphs;
+	var b = g.currBrowser;
+	if(b == null) {
+		b = 0;
+		while(!g.browsers[b]() && b < g.browsers.length-1)
+			b++;
+		g.currBrowser = b;
+	}
+	if(!g.codes[name])
+		return "";
+	return g.codes[name][b];
+}
+//-
+//- Animation engine
+//-
+
+function Animator()
+{
+	this.running = 0; // Incremented at start of each animation, decremented afterwards. If zero, the interval timer is disabled
+	this.timerID = 0; // ID of the timer used for animating
+	this.animations = []; // List of animations in progress
+	return this;
+}
+
+// Start animation engine
+Animator.prototype.startAnimating = function() // Variable number of arguments
+{
+	for(var t=0; t<arguments.length; t++)
+		this.animations.push(arguments[t]);
+	if(this.running == 0) {
+		var me = this;
+		this.timerID = window.setInterval(function() {me.doAnimate(me);},10);
+	}
+	this.running += arguments.length;
+};
+
+// Perform an animation engine tick, calling each of the known animation modules
+Animator.prototype.doAnimate = function(me)
+{
+	var a = 0;
+	while(a < me.animations.length) {
+		var animation = me.animations[a];
+		if(animation.tick()) {
+			a++;
+		} else {
+			me.animations.splice(a,1);
+			if(--me.running == 0)
+				window.clearInterval(me.timerID);
+		}
+	}
+};
+
+// Map a 0..1 value to 0..1, but slow down at the start and end
+Animator.slowInSlowOut = function(progress)
+{
+	return(1-((Math.cos(progress * Math.PI)+1)/2));
+};
+
+//--
+//-- Morpher animation
+//--
+
+// Animate a set of properties of an element
+function Morpher(element,duration,properties,callback)
+{
+	this.element = element;
+	this.duration = duration;
+	this.properties = properties;
+	this.startTime = new Date();
+	this.endTime = Number(this.startTime) + duration;
+	this.callback = callback;
+	this.tick();
+	return this;
+}
+
+Morpher.prototype.assignStyle = function(element,style,value)
+{
+	switch(style) {
+		case "-tw-vertScroll":
+			window.scrollTo(findScrollX(),value);
+			break;
+		case "-tw-horizScroll":
+			window.scrollTo(value,findScrollY());
+			break;
+		default:
+			element.style[style] = value;
+			break;
+	}
+};
+
+Morpher.prototype.stop = function()
+{
+	for(var t=0; t<this.properties.length; t++) {
+		var p = this.properties[t];
+		if(p.atEnd !== undefined) {
+			this.assignStyle(this.element,p.style,p.atEnd);
+		}
+	}
+	if(this.callback)
+		this.callback(this.element,this.properties);
+};
+
+Morpher.prototype.tick = function()
+{
+	var currTime = Number(new Date());
+	progress = Animator.slowInSlowOut(Math.min(1,(currTime-this.startTime)/this.duration));
+	for(var t=0; t<this.properties.length; t++) {
+		var p = this.properties[t];
+		if(p.start !== undefined && p.end !== undefined) {
+			var template = p.template ? p.template : "%0";
+			switch(p.format) {
+				case undefined:
+				case "style":
+					var v = p.start + (p.end-p.start) * progress;
+					this.assignStyle(this.element,p.style,template.format([v]));
+					break;
+				case "color":
+					break;
+			}
+		}
+	}
+	if(currTime >= this.endTime) {
+		this.stop();
+		return false;
+	}
+	return true;
+};
+
+//--
+//-- Zoomer animation
+//--
+
+function Zoomer(text,startElement,targetElement,unused)
+{
+	var e = createTiddlyElement(document.body,"div",null,"zoomer");
+	createTiddlyElement(e,"div",null,null,text);
+	var winWidth = findWindowWidth();
+	var winHeight = findWindowHeight();
+	var p = [
+		{style: 'left', start: findPosX(startElement), end: findPosX(targetElement), template: '%0px'},
+		{style: 'top', start: findPosY(startElement), end: findPosY(targetElement), template: '%0px'},
+		{style: 'width', start: Math.min(startElement.scrollWidth,winWidth), end: Math.min(targetElement.scrollWidth,winWidth), template: '%0px', atEnd: 'auto'},
+		{style: 'height', start: Math.min(startElement.scrollHeight,winHeight), end: Math.min(targetElement.scrollHeight,winHeight), template: '%0px', atEnd: 'auto'},
+		{style: 'fontSize', start: 8, end: 24, template: '%0pt'}
+	];
+	var c = function(element,properties) {removeNode(element);};
+	return new Morpher(e,config.animDuration,p,c);
+}
+
+//--
+//-- Scroller animation
+//--
+
+function Scroller(targetElement,unused)
+{
+	var p = [
+		{style: '-tw-vertScroll', start: findScrollY(), end: ensureVisible(targetElement)}
+	];
+	return new Morpher(targetElement,config.animDuration,p);
+}
+
+//--
+//-- Slider animation
+//--
+
+// deleteMode - "none", "all" [delete target element and it's children], [only] "children" [but not the target element]
+function Slider(element,opening,unused,deleteMode)
+{
+	element.style.overflow = 'hidden';
+	if(opening)
+		element.style.height = '0px'; // Resolves a Firefox flashing bug
+	element.style.display = 'block';
+	var left = findPosX(element);
+	var width = element.scrollWidth;
+	var height = element.scrollHeight;
+	var winWidth = findWindowWidth();
+	var p = [];
+	var c = null;
+	if(opening) {
+		p.push({style: 'height', start: 0, end: height, template: '%0px', atEnd: 'auto'});
+		p.push({style: 'opacity', start: 0, end: 1, template: '%0'});
+		p.push({style: 'filter', start: 0, end: 100, template: 'alpha(opacity:%0)'});
+	} else {
+		p.push({style: 'height', start: height, end: 0, template: '%0px'});
+		p.push({style: 'display', atEnd: 'none'});
+		p.push({style: 'opacity', start: 1, end: 0, template: '%0'});
+		p.push({style: 'filter', start: 100, end: 0, template: 'alpha(opacity:%0)'});
+		switch(deleteMode) {
+			case "all":
+				c = function(element,properties) {removeNode(element);};
+				break;
+			case "children":
+				c = function(element,properties) {removeChildren(element);};
+				break;
+		}
+	}
+	return new Morpher(element,config.animDuration,p,c);
+}
+
+//--
+//-- Popup menu
+//--
+
+var Popup = {
+	stack: [] // Array of objects with members root: and popup:
+	};
+
+Popup.create = function(root,elem,theClass)
+{
+	Popup.remove();
+	var popup = createTiddlyElement(document.body,elem ? elem : "ol","popup",theClass ? theClass : "popup");
+	Popup.stack.push({root: root, popup: popup});
+	return popup;
+};
+
+Popup.onDocumentClick = function(e)
+{
+	if (!e) var e = window.event;
+	var target = resolveTarget(e);
+	if(e.eventPhase == undefined)
+		Popup.remove();
+	else if(e.eventPhase == Event.BUBBLING_PHASE || e.eventPhase == Event.AT_TARGET)
+		Popup.remove();
+	return true;
+};
+
+Popup.show = function(unused1,unused2)
+{
+	var curr = Popup.stack[Popup.stack.length-1];
+	this.place(curr.root,curr.popup);
+	addClass(curr.root,"highlight");
+	if(config.options.chkAnimate && anim && typeof Scroller == "function")
+		anim.startAnimating(new Scroller(curr.popup));
+	else
+		window.scrollTo(0,ensureVisible(curr.popup));
+};
+
+Popup.place = function(root,popup,offset)
+{
+	if(!offset) var offset = {x:0, y:0};
+	var rootLeft = findPosX(root);
+	var rootTop = findPosY(root);
+	var rootHeight = root.offsetHeight;
+	var popupLeft = rootLeft + offset.x;
+	var popupTop = rootTop + rootHeight + offset.y;
+	var winWidth = findWindowWidth();
+	if(popup.offsetWidth > winWidth*0.75)
+		popup.style.width = winWidth*0.75 + "px";
+	var popupWidth = popup.offsetWidth;
+	if(popupLeft + popupWidth > winWidth)
+		popupLeft = winWidth - popupWidth;
+	popup.style.left = popupLeft + "px";
+	popup.style.top = popupTop + "px";
+	popup.style.display = "block";
+}
+
+Popup.remove = function()
+{
+	if(Popup.stack.length > 0) {
+		Popup.removeFrom(0);
+	}
+};
+
+Popup.removeFrom = function(from)
+{
+	for(var t=Popup.stack.length-1; t>=from; t--) {
+		var p = Popup.stack[t];
+		removeClass(p.root,"highlight");
+		removeNode(p.popup);
+	}
+	Popup.stack = Popup.stack.slice(0,from);
+};
+
+//--
+//-- Wizard support
+//--
+
+function Wizard(elem)
+{
+	if(elem) {
+		this.formElem = findRelated(elem,"wizard","className");
+		this.bodyElem = findRelated(this.formElem.firstChild,"wizardBody","className","nextSibling");
+		this.footElem = findRelated(this.formElem.firstChild,"wizardFooter","className","nextSibling");
+	} else {
+		this.formElem = null;
+		this.bodyElem = null;
+		this.footElem = null;
+	}
+}
+
+Wizard.prototype.setValue = function(name,value)
+{
+	if(this.formElem)
+		this.formElem[name] = value;
+};
+
+Wizard.prototype.getValue = function(name)
+{
+	return this.formElem ? this.formElem[name] : null;
+};
+
+Wizard.prototype.createWizard = function(place,title)
+{
+	this.formElem = createTiddlyElement(place,"form",null,"wizard");
+	createTiddlyElement(this.formElem,"h1",null,null,title);
+	this.bodyElem = createTiddlyElement(this.formElem,"div",null,"wizardBody");
+	this.footElem = createTiddlyElement(this.formElem,"div",null,"wizardFooter");
+};
+
+Wizard.prototype.clear = function()
+{
+	removeChildren(this.bodyElem);
+};
+
+Wizard.prototype.setButtons = function(buttonInfo,status)
+{
+	removeChildren(this.footElem);
+	for(var t=0; t<buttonInfo.length; t++) {
+		createTiddlyButton(this.footElem,buttonInfo[t].caption,buttonInfo[t].tooltip,buttonInfo[t].onClick);
+		insertSpacer(this.footElem);
+		}
+	if(typeof status == "string") {
+		createTiddlyElement(this.footElem,"span",null,"status",status);
+	}
+};
+
+Wizard.prototype.addStep = function(stepTitle,html)
+{
+	removeChildren(this.bodyElem);
+	var w = createTiddlyElement(this.bodyElem,"div");
+	createTiddlyElement(w,"h2",null,null,stepTitle);
+	var step = createTiddlyElement(w,"div",null,"wizardStep");
+	step.innerHTML = html;
+	applyHtmlMacros(step,tiddler);
+};
+
+Wizard.prototype.getElement = function(name)
+{
+	return this.formElem.elements[name];
+};
+
+//--
+//-- ListView gadget
+//--
+
+var ListView = {};
+
+// Create a listview
+ListView.create = function(place,listObject,listTemplate,callback,className)
+{
+	var table = createTiddlyElement(place,"table",null,className ? className : "listView twtable");
+	var thead = createTiddlyElement(table,"thead");
+	var r = createTiddlyElement(thead,"tr");
+	for(var t=0; t<listTemplate.columns.length; t++) {
+		var columnTemplate = listTemplate.columns[t];
+		var c = createTiddlyElement(r,"th");
+		var colType = ListView.columnTypes[columnTemplate.type];
+		if(colType && colType.createHeader)
+			colType.createHeader(c,columnTemplate,t);
+	}
+	var tbody = createTiddlyElement(table,"tbody");
+	for(var rc=0; rc<listObject.length; rc++) {
+		rowObject = listObject[rc];
+		r = createTiddlyElement(tbody,"tr");
+		for(c=0; c<listTemplate.rowClasses.length; c++) {
+			if(rowObject[listTemplate.rowClasses[c].field])
+				addClass(r,listTemplate.rowClasses[c].className);
+		}
+		rowObject.rowElement = r;
+		rowObject.colElements = {};
+		for(var cc=0; cc<listTemplate.columns.length; cc++) {
+			c = createTiddlyElement(r,"td");
+			columnTemplate = listTemplate.columns[cc];
+			var field = columnTemplate.field;
+			colType = ListView.columnTypes[columnTemplate.type];
+			if(colType && colType.createItem)
+				colType.createItem(c,rowObject,field,columnTemplate,cc,rc);
+			rowObject.colElements[field] = c;
+		}
+	}
+	if(callback && listTemplate.actions)
+		createTiddlyDropDown(place,ListView.getCommandHandler(callback),listTemplate.actions);
+	if(callback && listTemplate.buttons) {
+		for(t=0; t<listTemplate.buttons.length; t++) {
+			var a = listTemplate.buttons[t];
+			if(a && a.name != "")
+				createTiddlyButton(place,a.caption,null,ListView.getCommandHandler(callback,a.name,a.allowEmptySelection));
+		}
+	}
+	return table;
+};
+
+ListView.getCommandHandler = function(callback,name,allowEmptySelection)
+{
+	return function(e) {
+		var view = findRelated(this,"TABLE",null,"previousSibling");
+		var tiddlers = [];
+		ListView.forEachSelector(view,function(e,rowName) {
+					if(e.checked)
+						tiddlers.push(rowName);
+					});
+		if(tiddlers.length == 0 && !allowEmptySelection) {
+			alert(config.messages.nothingSelected);
+		} else {
+			if(this.nodeName.toLowerCase() == "select") {
+				callback(view,this.value,tiddlers);
+				this.selectedIndex = 0;
+			} else {
+				callback(view,name,tiddlers);
+			}
+		}
+	};
+};
+
+// Invoke a callback for each selector checkbox in the listview
+ListView.forEachSelector = function(view,callback)
+{
+	var checkboxes = view.getElementsByTagName("input");
+	var hadOne = false;
+	for(var t=0; t<checkboxes.length; t++) {
+		var cb = checkboxes[t];
+		if(cb.getAttribute("type") == "checkbox") {
+			var rn = cb.getAttribute("rowName");
+			if(rn) {
+				callback(cb,rn);
+				hadOne = true;
+			}
+		}
+	}
+	return hadOne;
+};
+
+ListView.getSelectedRows = function(view)
+{
+	var rowNames = [];
+	ListView.forEachSelector(view,function(e,rowName) {
+				if(e.checked)
+					rowNames.push(rowName);
+				});
+	return rowNames;
+};
+
+ListView.columnTypes = {};
+
+ListView.columnTypes.String = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyText(place,columnTemplate.title);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v);
+		}
+};
+
+ListView.columnTypes.WikiText = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				wikify(v,place,null,null);
+		}
+};
+
+ListView.columnTypes.Tiddler = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined && v.title)
+				createTiddlyPopup(place,v.title,config.messages.listView.tiddlerTooltip,v);
+		}
+};
+
+ListView.columnTypes.Size = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				var t = 0;
+				while(t<config.messages.sizeTemplates.length-1 && v<config.messages.sizeTemplates[t].unit)
+					t++;
+				createTiddlyText(place,config.messages.sizeTemplates[t].template.format([Math.round(v/config.messages.sizeTemplates[t].unit)]));
+			}
+		}
+};
+
+ListView.columnTypes.Link = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			var c = columnTemplate.text;
+			if(v != undefined)
+				createTiddlyText(createExternalLink(place,v),c ? c : v);
+		}
+};
+
+ListView.columnTypes.Date = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v.formatString(columnTemplate.dateFormat));
+		}
+};
+
+ListView.columnTypes.StringList = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				for(var t=0; t<v.length; t++) {
+					createTiddlyText(place,v[t]);
+					createTiddlyElement(place,"br");
+				}
+			}
+		}
+};
+
+ListView.columnTypes.Selector = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyCheckbox(place,null,false,this.onHeaderChange);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],null);
+			e.setAttribute("rowName",listObject[columnTemplate.rowName]);
+		},
+	onHeaderChange: function(e)
+		{
+			var state = this.checked;
+			var view = findRelated(this,"TABLE");
+			if(!view)
+				return;
+			ListView.forEachSelector(view,function(e,rowName) {
+								e.checked = state;
+							});
+		}
+};
+
+ListView.columnTypes.Tags = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var tags = listObject[field];
+			createTiddlyText(place,String.encodeTiddlyLinkList(tags));
+		}
+};
+
+ListView.columnTypes.Boolean = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			if(listObject[field] == true)
+				createTiddlyText(place,columnTemplate.trueText);
+			if(listObject[field] == false)
+				createTiddlyText(place,columnTemplate.falseText);
+		}
+};
+
+ListView.columnTypes.TagCheckbox = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],this.onChange);
+			e.setAttribute("tiddler",listObject.title);
+			e.setAttribute("tag",columnTemplate.tag);
+		},
+	onChange : function(e)
+		{
+			var tag = this.getAttribute("tag");
+			var tiddler = this.getAttribute("tiddler");
+			store.setTiddlerTag(tiddler,this.checked,tag);
+		}
+};
+
+ListView.columnTypes.TiddlerLink = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				var link = createTiddlyLink(place,listObject[columnTemplate.tiddlerLink],false,null);
+				createTiddlyText(link,listObject[field]);
+			}
+		}
+};
+
+//--
+//-- Augmented methods for the JavaScript Number(), Array(), String() and Date() objects
+//--
+
+// Clamp a number to a range
+Number.prototype.clamp = function(min,max)
+{
+	var c = this;
+	if(c < min)
+		c = min;
+	if(c > max)
+		c = max;
+	return c;
+};
+
+// Add indexOf function if browser does not support it
+if(!Array.indexOf) {
+Array.prototype.indexOf = function(item,from)
+{
+	if(!from)
+		from = 0;
+	for(var i=from; i<this.length; i++) {
+		if(this[i] === item)
+			return i;
+	}
+	return -1;
+};}
+
+// Find an entry in a given field of the members of an array
+Array.prototype.findByField = function(field,value)
+{
+	for(var t=0; t<this.length; t++) {
+		if(this[t][field] == value)
+			return t;
+	}
+	return null;
+};
+
+// Return whether an entry exists in an array
+Array.prototype.contains = function(item)
+{
+	return this.indexOf(item) != -1;
+};
+
+// Adds, removes or toggles a particular value within an array
+//  value - value to add
+//  mode - +1 to add value, -1 to remove value, 0 to toggle it
+Array.prototype.setItem = function(value,mode)
+{
+	var p = this.indexOf(value);
+	if(mode == 0)
+		mode = (p == -1) ? +1 : -1;
+	if(mode == +1) {
+		if(p == -1)
+			this.push(value);
+	} else if(mode == -1) {
+		if(p != -1)
+			this.splice(p,1);
+	}
+};
+
+// Return whether one of a list of values exists in an array
+Array.prototype.containsAny = function(items)
+{
+	for(var i=0; i<items.length; i++) {
+		if (this.indexOf(items[i]) != -1)
+			return true;
+	}
+	return false;
+};
+
+// Return whether all of a list of values exists in an array
+Array.prototype.containsAll = function(items)
+{
+	for (var i = 0; i<items.length; i++) {
+		if (this.indexOf(items[i]) == -1)
+			return false;
+	}
+	return true;
+};
+
+// Push a new value into an array only if it is not already present in the array. If the optional unique parameter is false, it reverts to a normal push
+Array.prototype.pushUnique = function(item,unique)
+{
+	if(unique === false) {
+		this.push(item);
+	} else {
+		if(this.indexOf(item) == -1)
+			this.push(item);
+	}
+};
+
+Array.prototype.remove = function(item)
+{
+	var p = this.indexOf(item);
+	if(p != -1)
+		this.splice(p,1);
+};
+
+// Get characters from the right end of a string
+String.prototype.right = function(n)
+{
+	return n < this.length ? this.slice(this.length-n) : this;
+};
+
+// Trim whitespace from both ends of a string
+String.prototype.trim = function()
+{
+	return this.replace(/^\s*|\s*$/g,"");
+};
+
+// Convert a string from a CSS style property name to a JavaScript style name ("background-color" -> "backgroundColor")
+String.prototype.unDash = function()
+{
+	var s = this.split("-");
+	if(s.length > 1) {
+		for(var t=1; t<s.length; t++)
+			s[t] = s[t].substr(0,1).toUpperCase() + s[t].substr(1);
+	}
+	return s.join("");
+};
+
+// Substitute substrings from an array into a format string that includes '%1'-type specifiers
+String.prototype.format = function(substrings)
+{
+	var subRegExp = /(?:%(\d+))/mg;
+	var currPos = 0;
+	var r = [];
+	do {
+		var match = subRegExp.exec(this);
+		if(match && match[1]) {
+			if(match.index > currPos)
+				r.push(this.substring(currPos,match.index));
+			r.push(substrings[parseInt(match[1])]);
+			currPos = subRegExp.lastIndex;
+		}
+	} while(match);
+	if(currPos < this.length)
+		r.push(this.substring(currPos,this.length));
+	return r.join("");
+};
+
+// Escape any special RegExp characters with that character preceded by a backslash
+String.prototype.escapeRegExp = function()
+{
+	var s = "\\^$*+?()=!|,{}[].";
+	var c = this;
+	for(var t=0; t<s.length; t++)
+		c = c.replace(new RegExp("\\" + s.substr(t,1),"g"),"\\" + s.substr(t,1));
+	return c;
+};
+
+// Convert "\" to "\s", newlines to "\n" (and remove carriage returns)
+String.prototype.escapeLineBreaks = function()
+{
+	return this.replace(/\\/mg,"\\s").replace(/\n/mg,"\\n").replace(/\r/mg,"");
+};
+
+// Convert "\n" to newlines, "\b" to " ", "\s" to "\" (and remove carriage returns)
+String.prototype.unescapeLineBreaks = function()
+{
+	return this.replace(/\\n/mg,"\n").replace(/\\b/mg," ").replace(/\\s/mg,"\\").replace(/\r/mg,"");
+};
+
+// Convert & to "&amp;", < to "&lt;", > to "&gt;" and " to "&quot;"
+String.prototype.htmlEncode = function()
+{
+	return this.replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;").replace(/\"/mg,"&quot;");
+};
+
+// Convert "&amp;" to &, "&lt;" to <, "&gt;" to > and "&quot;" to "
+String.prototype.htmlDecode = function()
+{
+	return this.replace(/&lt;/mg,"<").replace(/&gt;/mg,">").replace(/&quot;/mg,"\"").replace(/&amp;/mg,"&");
+};
+
+// Convert a string to it's JSON representation by encoding control characters, double quotes and backslash. See json.org
+String.prototype.toJSONString = function()
+{
+	var m = {
+		'\b': '\\b',
+		'\f': '\\f',
+		'\n': '\\n',
+		'\r': '\\r',
+		'\t': '\\t',
+		'"' : '\\"',
+		'\\': '\\\\'
+		};
+	var replaceFn = function(a,b) {
+		var c = m[b];
+		if(c)
+			return c;
+		c = b.charCodeAt();
+		return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16);
+		};
+	if(/["\\\x00-\x1f]/.test(this))
+		return '"' + this.replace(/([\x00-\x1f\\"])/g,replaceFn) + '"';
+	return '"' + this + '"';
+};
+
+// Parse a space-separated string of name:value parameters
+// The result is an array of objects:
+//   result[0] = object with a member for each parameter name, value of that member being an array of values
+//   result[1..n] = one object for each parameter, with 'name' and 'value' members
+String.prototype.parseParams = function(defaultName,defaultValue,allowEval,noNames,cascadeDefaults)
+{
+	var parseToken = function(match,p) {
+		var n;
+		if(match[p]) // Double quoted
+			n = match[p];
+		else if(match[p+1]) // Single quoted
+			n = match[p+1];
+		else if(match[p+2]) // Double-square-bracket quoted
+			n = match[p+2];
+		else if(match[p+3]) // Double-brace quoted
+			try {
+				n = match[p+3];
+				if(allowEval)
+					n = window.eval(n);
+			} catch(ex) {
+				throw "Unable to evaluate {{" + match[p+3] + "}}: " + exceptionText(ex);
+			}
+		else if(match[p+4]) // Unquoted
+			n = match[p+4];
+		else if(match[p+5]) // empty quote
+			n = "";
+		return n;
+	};
+	var r = [{}];
+	var dblQuote = "(?:\"((?:(?:\\\\\")|[^\"])+)\")";
+	var sngQuote = "(?:'((?:(?:\\\\\')|[^'])+)')";
+	var dblSquare = "(?:\\[\\[((?:\\s|\\S)*?)\\]\\])";
+	var dblBrace = "(?:\\{\\{((?:\\s|\\S)*?)\\}\\})";
+	var unQuoted = noNames ? "([^\"'\\s]\\S*)" : "([^\"':\\s][^\\s:]*)";
+	var emptyQuote = "((?:\"\")|(?:''))";
+	var skipSpace = "(?:\\s*)";
+	var token = "(?:" + dblQuote + "|" + sngQuote + "|" + dblSquare + "|" + dblBrace + "|" + unQuoted + "|" + emptyQuote + ")";
+	var re = noNames ? new RegExp(token,"mg") : new RegExp(skipSpace + token + skipSpace + "(?:(\\:)" + skipSpace + token + ")?","mg");
+	var params = [];
+	do {
+		var match = re.exec(this);
+		if(match) {
+			var n = parseToken(match,1);
+			if(noNames) {
+				r.push({name:"",value:n});
+			} else {
+				var v = parseToken(match,8);
+				if(v == null && defaultName) {
+					v = n;
+					n = defaultName;
+				} else if(v == null && defaultValue) {
+					v = defaultValue;
+				}
+				r.push({name:n,value:v});
+				if(cascadeDefaults) {
+					defaultName = n;
+					defaultValue = v;
+				}
+			}
+		}
+	} while(match);
+	// Summarise parameters into first element
+	for(var t=1; t<r.length; t++) {
+		if(r[0][r[t].name])
+			r[0][r[t].name].push(r[t].value);
+		else
+			r[0][r[t].name] = [r[t].value];
+	}
+	return r;
+};
+
+// Process a string list of macro parameters into an array. Parameters can be quoted with "", '',
+// [[]], {{ }} or left unquoted (and therefore space-separated). Double-braces {{}} results in
+// an *evaluated* parameter: e.g. {{config.options.txtUserName}} results in the current user's name.
+String.prototype.readMacroParams = function()
+{
+	var p = this.parseParams("list",null,true,true);
+	var n = [];
+	for(var t=1; t<p.length; t++)
+		n.push(p[t].value);
+	return n;
+};
+
+// Process a string list of unique tiddler names into an array. Tiddler names that have spaces in them must be [[bracketed]]
+String.prototype.readBracketedList = function(unique)
+{
+	var p = this.parseParams("list",null,false,true);
+	var n = [];
+	for(var t=1; t<p.length; t++)
+		n.pushUnique(p[t].value,unique);
+	return n;
+};
+
+// Returns array with start and end index of chunk between given start and end marker, or undefined.
+String.prototype.getChunkRange = function(start,end) 
+{
+	var s = this.indexOf(start);
+	if(s != -1) {
+		s += start.length;
+		var e = this.indexOf(end,s);
+		if(e != -1)
+			return [s,e];
+	}
+};
+
+// Replace a chunk of a string given start and end markers
+String.prototype.replaceChunk = function(start,end,sub)
+{
+	var r = this.getChunkRange(start,end);
+	return r ? this.substring(0,r[0]) + sub + this.substring(r[1]) : this;
+};
+
+// Returns a chunk of a string between start and end markers, or undefined
+String.prototype.getChunk = function(start,end)
+{
+	var r = this.getChunkRange(start,end);
+	if(r)
+		return this.substring(r[0],r[1]);
+};
+
+
+// Static method to bracket a string with double square brackets if it contains a space
+String.encodeTiddlyLink = function(title)
+{
+	return title.indexOf(" ") == -1 ? title : "[[" + title + "]]";
+};
+
+// Static method to encodeTiddlyLink for every item in an array and join them with spaces
+String.encodeTiddlyLinkList = function(list)
+{
+	if(list) {
+		var results = [];
+		for(var t=0; t<list.length; t++)
+			results.push(String.encodeTiddlyLink(list[t]));
+		return results.join(" ");
+	} else {
+		return "";
+	}
+};
+
+// Convert a string as a sequence of name:"value" pairs into a hashmap
+String.prototype.decodeHashMap = function()
+{
+	var fields = this.parseParams("anon","",false);
+	var r = {};
+	for(var t=1; t<fields.length; t++)
+		r[fields[t].name] = fields[t].value;
+	return r;
+};
+
+// Static method to encode a hashmap into a name:"value"... string
+String.encodeHashMap = function(hashmap)
+{
+	var r = [];
+	for(var t in hashmap)
+		r.push(t + ':"' + hashmap[t] + '"');
+	return r.join(" ");
+};
+
+// Static method to left-pad a string with 0s to a certain width
+String.zeroPad = function(n,d)
+{
+	var s = n.toString();
+	if(s.length < d)
+		s = "000000000000000000000000000".substr(0,d-s.length) + s;
+	return s;
+};
+
+String.prototype.startsWith = function(prefix) 
+{
+	return !prefix || this.substring(0,prefix.length) == prefix;
+};
+
+// Returns the first value of the given named parameter.
+function getParam(params,name,defaultValue)
+{
+	if(!params)
+		return defaultValue;
+	var p = params[0][name];
+	return p ? p[0] : defaultValue;
+}
+
+// Returns the first value of the given boolean named parameter.
+function getFlag(params,name,defaultValue)
+{
+	return !!getParam(params,name,defaultValue);
+}
+
+// Substitute date components into a string
+Date.prototype.formatString = function(template)
+{
+	var t = template.replace(/0hh12/g,String.zeroPad(this.getHours12(),2));
+	t = t.replace(/hh12/g,this.getHours12());
+	t = t.replace(/0hh/g,String.zeroPad(this.getHours(),2));
+	t = t.replace(/hh/g,this.getHours());
+	t = t.replace(/mmm/g,config.messages.dates.shortMonths[this.getMonth()]);
+	t = t.replace(/0mm/g,String.zeroPad(this.getMinutes(),2));
+	t = t.replace(/mm/g,this.getMinutes());
+	t = t.replace(/0ss/g,String.zeroPad(this.getSeconds(),2));
+	t = t.replace(/ss/g,this.getSeconds());
+	t = t.replace(/[ap]m/g,this.getAmPm().toLowerCase());
+	t = t.replace(/[AP]M/g,this.getAmPm().toUpperCase());
+	t = t.replace(/wYYYY/g,this.getYearForWeekNo());
+	t = t.replace(/wYY/g,String.zeroPad(this.getYearForWeekNo()-2000,2));
+	t = t.replace(/YYYY/g,this.getFullYear());
+	t = t.replace(/YY/g,String.zeroPad(this.getFullYear()-2000,2));
+	t = t.replace(/MMM/g,config.messages.dates.months[this.getMonth()]);
+	t = t.replace(/0MM/g,String.zeroPad(this.getMonth()+1,2));
+	t = t.replace(/MM/g,this.getMonth()+1);
+	t = t.replace(/0WW/g,String.zeroPad(this.getWeek(),2));
+	t = t.replace(/WW/g,this.getWeek());
+	t = t.replace(/DDD/g,config.messages.dates.days[this.getDay()]);
+	t = t.replace(/ddd/g,config.messages.dates.shortDays[this.getDay()]);
+	t = t.replace(/0DD/g,String.zeroPad(this.getDate(),2));
+	t = t.replace(/DDth/g,this.getDate()+this.daySuffix());
+	t = t.replace(/DD/g,this.getDate());
+	return t;
+};
+
+Date.prototype.getWeek = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if (d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week to calculate weekNo
+	var n = Math.floor((dt.getTime()-new Date(dt.getFullYear(),0,1)+3600000)/86400000); 
+	return Math.floor(n/7)+1;
+};
+
+Date.prototype.getYearForWeekNo = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if (d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week
+	return dt.getFullYear();
+};
+
+Date.prototype.getHours12 = function()
+{
+	var h = this.getHours();
+	return h > 12 ? h-12 : ( h > 0 ? h : 12 );
+};
+
+Date.prototype.getAmPm = function()
+{
+	return this.getHours() >= 12 ? config.messages.dates.pm : config.messages.dates.am;
+};
+
+Date.prototype.daySuffix = function()
+{
+	return config.messages.dates.daySuffixes[this.getDate()-1];
+};
+
+// Convert a date to local YYYYMMDDHHMM string format
+Date.prototype.convertToLocalYYYYMMDDHHMM = function()
+{
+	return String.zeroPad(this.getFullYear(),4) + String.zeroPad(this.getMonth()+1,2) + String.zeroPad(this.getDate(),2) + String.zeroPad(this.getHours(),2) + String.zeroPad(this.getMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDDHHMM string format
+Date.prototype.convertToYYYYMMDDHHMM = function()
+{
+	return String.zeroPad(this.getUTCFullYear(),4) + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDD.HHMMSSMMM string format
+Date.prototype.convertToYYYYMMDDHHMMSSMMM = function()
+{
+	return String.zeroPad(this.getUTCFullYear(),4) + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + "." + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2) + String.zeroPad(this.getUTCSeconds(),2) + String.zeroPad(this.getUTCMilliseconds(),4);
+};
+
+// Static method to create a date from a UTC YYYYMMDDHHMM format string
+Date.convertFromYYYYMMDDHHMM = function(d)
+{
+	return new Date(Date.UTC(parseInt(d.substr(0,4),10),
+			parseInt(d.substr(4,2),10)-1,
+			parseInt(d.substr(6,2),10),
+			parseInt(d.substr(8,2),10),
+			parseInt(d.substr(10,2),10),0,0));
+};
+
+//--
+//-- Crypto functions and associated conversion routines
+//--
+
+// Crypto "namespace"
+function Crypto() {}
+
+// Convert a string to an array of big-endian 32-bit words
+Crypto.strToBe32s = function(str)
+{
+	var be = Array();
+	var len = Math.floor(str.length/4);
+	var i, j;
+	for(i=0, j=0; i<len; i++, j+=4) {
+		be[i] = ((str.charCodeAt(j)&0xff) << 24)|((str.charCodeAt(j+1)&0xff) << 16)|((str.charCodeAt(j+2)&0xff) << 8)|(str.charCodeAt(j+3)&0xff);
+	}
+	while (j<str.length) {
+		be[j>>2] |= (str.charCodeAt(j)&0xff)<<(24-(j*8)%32);
+		j++;
+	}
+	return be;
+};
+
+// Convert an array of big-endian 32-bit words to a string
+Crypto.be32sToStr = function(be)
+{
+	var str = "";
+	for(var i=0;i<be.length*32;i+=8)
+		str += String.fromCharCode((be[i>>5]>>>(24-i%32)) & 0xff);
+	return str;
+};
+
+// Convert an array of big-endian 32-bit words to a hex string
+Crypto.be32sToHex = function(be)
+{
+	var hex = "0123456789ABCDEF";
+	var str = "";
+	for(var i=0;i<be.length*4;i++)
+		str += hex.charAt((be[i>>2]>>((3-i%4)*8+4))&0xF) + hex.charAt((be[i>>2]>>((3-i%4)*8))&0xF);
+	return str;
+};
+
+// Return, in hex, the SHA-1 hash of a string
+Crypto.hexSha1Str = function(str)
+{
+	return Crypto.be32sToHex(Crypto.sha1Str(str));
+};
+
+// Return the SHA-1 hash of a string
+Crypto.sha1Str = function(str)
+{
+	return Crypto.sha1(Crypto.strToBe32s(str),str.length);
+};
+
+// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words
+Crypto.sha1 = function(x,blen)
+{
+	// Add 32-bit integers, wrapping at 32 bits
+	add32 = function(a,b)
+	{
+		var lsw = (a&0xFFFF)+(b&0xFFFF);
+		var msw = (a>>16)+(b>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	};
+	// Add five 32-bit integers, wrapping at 32 bits
+	add32x5 = function(a,b,c,d,e)
+	{
+		var lsw = (a&0xFFFF)+(b&0xFFFF)+(c&0xFFFF)+(d&0xFFFF)+(e&0xFFFF);
+		var msw = (a>>16)+(b>>16)+(c>>16)+(d>>16)+(e>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	};
+	// Bitwise rotate left a 32-bit integer by 1 bit
+	rol32 = function(n)
+	{
+		return (n>>>31)|(n<<1);
+	};
+
+	var len = blen*8;
+	// Append padding so length in bits is 448 mod 512
+	x[len>>5] |= 0x80 << (24-len%32);
+	// Append length
+	x[((len+64>>9)<<4)+15] = len;
+	var w = Array(80);
+
+	var k1 = 0x5A827999;
+	var k2 = 0x6ED9EBA1;
+	var k3 = 0x8F1BBCDC;
+	var k4 = 0xCA62C1D6;
+
+	var h0 = 0x67452301;
+	var h1 = 0xEFCDAB89;
+	var h2 = 0x98BADCFE;
+	var h3 = 0x10325476;
+	var h4 = 0xC3D2E1F0;
+
+	for(var i=0;i<x.length;i+=16) {
+		var j,t;
+		var a = h0;
+		var b = h1;
+		var c = h2;
+		var d = h3;
+		var e = h4;
+		for(j = 0;j<16;j++) {
+			w[j] = x[i+j];
+			t = add32x5(e,(a>>>27)|(a<<5),d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=16;j<20;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=20;j<40;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),b^c^d,w[j],k2);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=40;j<60;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),(b&c)|(d&(b|c)),w[j],k3);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+		for(j=60;j<80;j++) {
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),b^c^d,w[j],k4);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+		}
+
+		h0 = add32(h0,a);
+		h1 = add32(h1,b);
+		h2 = add32(h2,c);
+		h3 = add32(h3,d);
+		h4 = add32(h4,e);
+	}
+	return Array(h0,h1,h2,h3,h4);
+};
+
+//--
+//-- RGB colour object
+//--
+
+// Construct an RGB colour object from a '#rrggbb', '#rgb' or 'rgb(n,n,n)' string or from separate r,g,b values
+function RGB(r,g,b)
+{
+	this.r = 0;
+	this.g = 0;
+	this.b = 0;
+	if(typeof r == "string") {
+		if(r.substr(0,1) == "#") {
+			if(r.length == 7) {
+				this.r = parseInt(r.substr(1,2),16)/255;
+				this.g = parseInt(r.substr(3,2),16)/255;
+				this.b = parseInt(r.substr(5,2),16)/255;
+			} else {
+				this.r = parseInt(r.substr(1,1),16)/15;
+				this.g = parseInt(r.substr(2,1),16)/15;
+				this.b = parseInt(r.substr(3,1),16)/15;
+			}
+		} else {
+			var rgbPattern = /rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)/;
+			var c = r.match(rgbPattern);
+			if(c) {
+				this.r = parseInt(c[1],10)/255;
+				this.g = parseInt(c[2],10)/255;
+				this.b = parseInt(c[3],10)/255;
+			}
+		}
+	} else {
+		this.r = r;
+		this.g = g;
+		this.b = b;
+	}
+	return this;
+}
+
+// Mixes this colour with another in a specified proportion
+// c = other colour to mix
+// f = 0..1 where 0 is this colour and 1 is the new colour
+// Returns an RGB object
+RGB.prototype.mix = function(c,f)
+{
+	return new RGB(this.r + (c.r-this.r) * f,this.g + (c.g-this.g) * f,this.b + (c.b-this.b) * f);
+};
+
+// Return an rgb colour as a #rrggbb format hex string
+RGB.prototype.toString = function()
+{
+	return "#" + ("0" + Math.floor(this.r.clamp(0,1) * 255).toString(16)).right(2) +
+				 ("0" + Math.floor(this.g.clamp(0,1) * 255).toString(16)).right(2) +
+				 ("0" + Math.floor(this.b.clamp(0,1) * 255).toString(16)).right(2);
+};
+
+//--
+//-- DOM utilities - many derived from www.quirksmode.org
+//--
+
+function drawGradient(place,horiz,colours)
+{
+	for(var t=0; t<= 100; t+=2) {
+		var bar = document.createElement("div");
+		place.appendChild(bar);
+		bar.style.position = "absolute";
+		bar.style.left = horiz ? t + "%" : 0;
+		bar.style.top = horiz ? 0 : t + "%";
+		bar.style.width = horiz ? (101-t) + "%" : "100%";
+		bar.style.height = horiz ? "100%" : (101-t) + "%";
+		bar.style.zIndex = -1;
+		var f = t/100;
+		var p = f*(colours.length-1);
+		bar.style.backgroundColor = colours[Math.floor(p)].mix(colours[Math.ceil(p)],p-Math.floor(p)).toString();
+	}
+}
+
+function createTiddlyText(theParent,theText)
+{
+	return theParent.appendChild(document.createTextNode(theText));
+}
+
+function createTiddlyCheckbox(theParent,caption,checked,onChange)
+{
+	var cb = document.createElement("input");
+	cb.setAttribute("type","checkbox");
+	cb.onclick = onChange;
+	theParent.appendChild(cb);
+	cb.checked = checked;
+	cb.className = "chkOptionInput";
+	if(caption)
+		wikify(caption,theParent);
+	return cb;
+}
+
+function createTiddlyElement(theParent,theElement,theID,theClass,theText)
+{
+	var e = document.createElement(theElement);
+	if(theClass != null)
+		e.className = theClass;
+	if(theID != null)
+		e.setAttribute("id",theID);
+	if(theText != null)
+		e.appendChild(document.createTextNode(theText));
+	if(theParent != null)
+		theParent.appendChild(e);
+	return e;
+}
+
+function addEvent(obj,type,fn)
+{
+	if(obj.attachEvent) {
+		obj['e'+type+fn] = fn;
+		obj[type+fn] = function(){obj['e'+type+fn](window.event);};
+		obj.attachEvent('on'+type,obj[type+fn]);
+	} else {
+		obj.addEventListener(type,fn,false);
+	}
+}
+
+function removeEvent(obj,type,fn)
+{
+	if(obj.detachEvent) {
+		obj.detachEvent('on'+type,obj[type+fn]);
+		obj[type+fn] = null;
+	} else {
+		obj.removeEventListener(type,fn,false);
+	}
+}
+
+function addClass(e,theClass)
+{
+	var currClass = e.className.split(" ");
+	if(currClass.indexOf(theClass) == -1)
+		e.className += " " + theClass;
+}
+
+function removeClass(e,theClass)
+{
+	var currClass = e.className.split(" ");
+	var i = currClass.indexOf(theClass);
+	while(i != -1) {
+		currClass.splice(i,1);
+		i = currClass.indexOf(theClass);
+	}
+	e.className = currClass.join(" ");
+}
+
+function hasClass(e,theClass)
+{
+	if(e.className) {
+		if(e.className.split(" ").indexOf(theClass) != -1)
+			return true;
+	}
+	return false;
+}
+
+// Find the closest relative with a given property value (property defaults to tagName, relative defaults to parentNode)
+function findRelated(e,value,name,relative)
+{
+	name = name ? name : "tagName";
+	relative = relative ? relative : "parentNode";
+	if(name == "className") {
+		while(e && !hasClass(e,value)) {
+			e = e[relative];
+		}
+	} else {
+		while(e && e[name] != value) {
+			e = e[relative];
+		}
+	}
+	return e;
+}
+
+// Resolve the target object of an event
+function resolveTarget(e)
+{
+	var obj;
+	if(e.target)
+		obj = e.target;
+	else if(e.srcElement)
+		obj = e.srcElement;
+	if(obj.nodeType == 3) // defeat Safari bug
+		obj = obj.parentNode;
+	return obj;
+}
+
+// Return the content of an element as plain text with no formatting
+function getPlainText(e)
+{
+	var text = "";
+	if(e.innerText)
+		text = e.innerText;
+	else if(e.textContent)
+		text = e.textContent;
+	return text;
+}
+
+// Get the scroll position for window.scrollTo necessary to scroll a given element into view
+function ensureVisible(e)
+{
+	var posTop = findPosY(e);
+	var posBot = posTop + e.offsetHeight;
+	var winTop = findScrollY();
+	var winHeight = findWindowHeight();
+	var winBot = winTop + winHeight;
+	if(posTop < winTop) {
+		return posTop;
+	} else if(posBot > winBot) {
+		if(e.offsetHeight < winHeight)
+			return posTop - (winHeight - e.offsetHeight);
+		else
+			return posTop;
+	} else {
+		return winTop;
+	}
+}
+
+// Get the current width of the display window
+function findWindowWidth()
+{
+	return window.innerWidth ? window.innerWidth : document.documentElement.clientWidth;
+}
+
+// Get the current height of the display window
+function findWindowHeight()
+{
+	return window.innerHeight ? window.innerHeight : document.documentElement.clientHeight;
+}
+
+// Get the current horizontal page scroll position
+function findScrollX()
+{
+	return window.scrollX ? window.scrollX : document.documentElement.scrollLeft;
+}
+
+// Get the current vertical page scroll position
+function findScrollY()
+{
+	return window.scrollY ? window.scrollY : document.documentElement.scrollTop;
+}
+
+function findPosX(obj)
+{
+	var curleft = 0;
+	while(obj.offsetParent) {
+		curleft += obj.offsetLeft;
+		obj = obj.offsetParent;
+	}
+	return curleft;
+}
+
+function findPosY(obj)
+{
+	var curtop = 0;
+	while(obj.offsetParent) {
+		curtop += obj.offsetTop;
+		obj = obj.offsetParent;
+	}
+	return curtop;
+}
+
+// Blur a particular element
+function blurElement(e)
+{
+	if(e != null && e.focus && e.blur) {
+		e.focus();
+		e.blur();
+	}
+}
+
+// Create a non-breaking space
+function insertSpacer(place)
+{
+	var e = document.createTextNode(String.fromCharCode(160));
+	if(place)
+		place.appendChild(e);
+	return e;
+}
+
+// Remove all children of a node
+function removeChildren(e)
+{
+	while(e && e.hasChildNodes())
+		removeNode(e.firstChild);
+}
+
+// Remove a node and all it's children
+function removeNode(e)
+{
+	scrubNode(e);
+	e.parentNode.removeChild(e);
+}
+
+// Remove any event handlers or non-primitve custom attributes
+function scrubNode(e)
+{
+	var att = e.attributes;
+	if(att) {
+		for(var t=0; t<att.length; t++) {
+			var n = att[t].name;
+			if(n !== 'style' && (typeof e[n] === 'function' || (typeof e[n] === 'object' && e[n] != null))) {
+				try {
+					e[n] = null;
+				} catch(ex) {
+				}
+			}
+		}
+	}
+	var c = e.firstChild;
+	while(c) {
+		scrubNode(c);
+		c = c.nextSibling;
+	}
+}
+
+// Add a stylesheet, replacing any previous custom stylesheet
+function setStylesheet(s,id,doc)
+{
+	if(!id)
+		id = "customStyleSheet";
+	if(!doc)
+		doc = document;
+	var n = doc.getElementById(id);
+	if(doc.createStyleSheet) {
+		// Test for IE's non-standard createStyleSheet method
+		if(n)
+			n.parentNode.removeChild(n);
+		// This failed without the &nbsp;
+		doc.getElementsByTagName("head")[0].insertAdjacentHTML("beforeEnd","&nbsp;<style id='" + id + "'>" + s + "</style>");
+	} else {
+		if(n) {
+			n.replaceChild(doc.createTextNode(s),n.firstChild);
+		} else {
+			n = doc.createElement("style");
+			n.type = "text/css";
+			n.id = id;
+			n.appendChild(doc.createTextNode(s));
+			doc.getElementsByTagName("head")[0].appendChild(n);
+		}
+	}
+}
+
+// Force the browser to do a document reflow when needed to workaround browser bugs
+function forceReflow()
+{
+	if(config.browser.isGecko) {
+		setStylesheet("body {top:-1em;margin-top:1em;}");
+		setStylesheet("");
+	}
+}
+
+// Replace the current selection of a textarea or text input and scroll it into view
+function replaceSelection(e,text)
+{
+	if(e.setSelectionRange) {
+		var oldpos = e.selectionStart;
+		var isRange = e.selectionEnd > e.selectionStart;
+		e.value = e.value.substr(0,e.selectionStart) + text + e.value.substr(e.selectionEnd);
+		e.setSelectionRange(isRange ? oldpos : oldpos + text.length,oldpos + text.length);
+		var linecount = e.value.split('\n').length;
+		var thisline = e.value.substr(0,e.selectionStart).split('\n').length-1;
+		e.scrollTop = Math.floor((thisline - e.rows / 2) * e.scrollHeight / linecount);
+	} else if(document.selection) {
+		var range = document.selection.createRange();
+		if(range.parentElement() == e) {
+			var isCollapsed = range.text == "";
+			range.text = text;
+			if(!isCollapsed) {
+				range.moveStart('character', -text.length);
+				range.select();
+			}
+		}
+	}
+}
+
+// Returns the text of the given (text) node, possibly merging subsequent text nodes
+function getNodeText(e)
+{
+	var t = ""; 
+	while(e && e.nodeName == "#text") {
+		t += e.nodeValue;
+		e = e.nextSibling;
+	}
+	return t;
+}
+
+//--
+//-- LoaderBase and SaverBase
+//--
+
+function LoaderBase() {}
+
+LoaderBase.prototype.loadTiddler = function(store,node,tiddlers)
+{
+	var title = this.getTitle(store,node);
+	if(title) {
+		var tiddler = store.createTiddler(title);
+		this.internalizeTiddler(store,tiddler,title,node);
+		tiddlers.push(tiddler);
+	}
+};
+
+LoaderBase.prototype.loadTiddlers = function(store,nodes)
+{
+	var tiddlers = [];
+	for(var t = 0; t < nodes.length; t++) {
+		try {
+			this.loadTiddler(store,nodes[t],tiddlers);
+		} catch(ex) {
+			showException(ex,config.messages.tiddlerLoadError.format([this.getTitle(store,nodes[t])]));
+		}
+	}
+	return tiddlers;
+};
+
+function SaverBase() {}
+
+SaverBase.prototype.externalize = function(store)
+{
+	var results = [];
+	var tiddlers = store.getTiddlers("title");
+	for(var t = 0; t < tiddlers.length; t++)
+		results.push(this.externalizeTiddler(store,tiddlers[t]));
+	return results.join("\n");
+};
+
+//--
+//-- TW21Loader (inherits from LoaderBase)
+//--
+
+function TW21Loader() {}
+
+TW21Loader.prototype = new LoaderBase();
+
+TW21Loader.prototype.getTitle = function(store,node)
+{
+	var title = null;
+	if(node.getAttribute) {
+		title = node.getAttribute("title");
+		if(!title)
+			title = node.getAttribute("tiddler");
+	}
+	if(!title && node.id) {
+		var lenPrefix = store.idPrefix.length;
+		if (node.id.substr(0,lenPrefix) == store.idPrefix)
+			title = node.id.substr(lenPrefix);
+	}
+	return title;
+};
+
+TW21Loader.prototype.internalizeTiddler = function(store,tiddler,title,node)
+{
+	var e = node.firstChild;
+	var text = null;
+	if(node.getAttribute("tiddler")) {
+		text = getNodeText(e).unescapeLineBreaks();
+	} else {
+		while(e.nodeName!="PRE" && e.nodeName!="pre") {
+			e = e.nextSibling;
+		}
+		text = e.innerHTML.replace(/\r/mg,"").htmlDecode();
+	}
+	var modifier = node.getAttribute("modifier");
+	var c = node.getAttribute("created");
+	var m = node.getAttribute("modified");
+	var created = c ? Date.convertFromYYYYMMDDHHMM(c) : version.date;
+	var modified = m ? Date.convertFromYYYYMMDDHHMM(m) : created;
+	var tags = node.getAttribute("tags");
+	var fields = {};
+	var attrs = node.attributes;
+	for(var i = attrs.length-1; i >= 0; i--) {
+		var name = attrs[i].name;
+		if (attrs[i].specified && !TiddlyWiki.isStandardField(name)) {
+			fields[name] = attrs[i].value.unescapeLineBreaks();
+		}
+	}
+	tiddler.assign(title,text,modifier,modified,tags,created,fields);
+	return tiddler;
+};
+
+//--
+//-- TW21Saver (inherits from SaverBase)
+//--
+
+function TW21Saver() {}
+
+TW21Saver.prototype = new SaverBase();
+
+TW21Saver.prototype.externalizeTiddler = function(store,tiddler)
+{
+	try {
+		var extendedAttributes = "";
+		var usePre = config.options.chkUsePreForStorage;
+		store.forEachField(tiddler,
+			function(tiddler,fieldName,value) {
+				// don't store stuff from the temp namespace
+				if(typeof value != "string")
+					value = "";
+				if (!fieldName.match(/^temp\./))
+					extendedAttributes += ' %0="%1"'.format([fieldName,value.escapeLineBreaks().htmlEncode()]);
+			},true);
+		var created = tiddler.created.convertToYYYYMMDDHHMM();
+		var modified = tiddler.modified.convertToYYYYMMDDHHMM();
+		var vdate = version.date.convertToYYYYMMDDHHMM();
+		var attributes = tiddler.modifier ? ' modifier="' + tiddler.modifier.htmlEncode() + '"' : "";
+		attributes += (usePre && modified == created) ? "" : ' modified="' + modified +'"';
+		attributes += (usePre && created == vdate) ? "" :' created="' + created + '"';
+		var tags = tiddler.getTags();
+		if(!usePre || tags)
+			attributes += ' tags="' + tags.htmlEncode() + '"';
+		return ('<div %0="%1"%2%3>%4</'+'div>').format([
+				usePre ? "title" : "tiddler",
+				tiddler.title.htmlEncode(),
+				attributes,
+				extendedAttributes,
+				usePre ? "\n<pre>" + tiddler.text.htmlEncode() + "</pre>\n" : tiddler.text.escapeLineBreaks().htmlEncode()
+			]);
+	} catch (ex) {
+		throw exceptionText(ex,config.messages.tiddlerSaveError.format([tiddler.title]));
+	}
+};
+
+//--
+//-- Deprecated code
+//--
+
+// @Deprecated: Use createElementAndWikify and this.termRegExp instead
+config.formatterHelpers.charFormatHelper = function(w)
+{
+	w.subWikify(createTiddlyElement(w.output,this.element),this.terminator);
+};
+
+// @Deprecated: Use enclosedTextHelper and this.lookaheadRegExp instead
+config.formatterHelpers.monospacedByLineHelper = function(w)
+{
+	var lookaheadRegExp = new RegExp(this.lookahead,"mg");
+	lookaheadRegExp.lastIndex = w.matchStart;
+	var lookaheadMatch = lookaheadRegExp.exec(w.source);
+	if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+		var text = lookaheadMatch[1];
+		if(config.browser.isIE)
+			text = text.replace(/\n/g,"\r");
+		createTiddlyElement(w.output,"pre",null,null,text);
+		w.nextMatch = lookaheadRegExp.lastIndex;
+	}
+};
+
+// @Deprecated: Use <br> or <br /> instead of <<br>>
+config.macros.br.handler = function(place)
+{
+	createTiddlyElement(place,"br");
+};
+
+// Find an entry in an array. Returns the array index or null
+// @Deprecated: Use indexOf instead
+Array.prototype.find = function(item)
+{
+	var i = this.indexOf(item);
+	return i == -1 ? null : i;
+};
+
+// Load a tiddler from an HTML DIV. The caller should make sure to later call Tiddler.changed()
+// @Deprecated: Use store.getLoader().internalizeTiddler instead
+Tiddler.prototype.loadFromDiv = function(divRef,title)
+{
+	return store.getLoader().internalizeTiddler(store,this,title,divRef);
+};
+
+// Format the text for storage in an HTML DIV
+// @Deprecated Use store.getSaver().externalizeTiddler instead.
+Tiddler.prototype.saveToDiv = function()
+{
+	return store.getSaver().externalizeTiddler(store,this);
+};
+
+// @Deprecated: Use store.allTiddlersAsHtml() instead
+function allTiddlersAsHtml()
+{
+	return store.allTiddlersAsHtml();
+}
+
+// @Deprecated: Use refreshPageTemplate instead
+function applyPageTemplate(title)
+{
+	refreshPageTemplate(title);
+}
+
+// @Deprecated: Use story.displayTiddlers instead
+function displayTiddlers(srcElement,titles,template,unused1,unused2,animate,unused3)
+{
+	story.displayTiddlers(srcElement,titles,template,animate);
+}
+
+// @Deprecated: Use story.displayTiddler instead
+function displayTiddler(srcElement,title,template,unused1,unused2,animate,unused3)
+{
+	story.displayTiddler(srcElement,title,template,animate);
+}
+
+// @Deprecated: Use functions on right hand side directly instead
+var createTiddlerPopup = Popup.create;
+var scrollToTiddlerPopup = Popup.show;
+var hideTiddlerPopup = Popup.remove;
+
+// @Deprecated: Use right hand side directly instead
+var regexpBackSlashEn = new RegExp("\\\\n","mg");
+var regexpBackSlash = new RegExp("\\\\","mg");
+var regexpBackSlashEss = new RegExp("\\\\s","mg");
+var regexpNewLine = new RegExp("\n","mg");
+var regexpCarriageReturn = new RegExp("\r","mg");
+//--
+//-- End of scripts
+//--
+//]]>
+</script>
+<script type="text/javascript">
+//<![CDATA[
+if(useJavaSaver)
+	document.write("<applet style='position:absolute;left:-1px' name='TiddlySaver' code='TiddlySaver.class' archive='TiddlySaver.jar' width='1' height='1'></applet>");
+//]]>
+</script>
+<!--POST-SCRIPT-START-->
+
+<!--POST-SCRIPT-END-->
+</body>
+</html>

From c29b6bdd9af313e91e321a007313a7a7f7b0c60e Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 12 Apr 2008 03:09:28 +0200
Subject: [PATCH 31/36] fix include for testsuite (note I did a partial merge
 and didn't take any of the new sourcefiles, so probably this is already fixed
 on cehtehs branch backend)

---
 tests/library/test-llist.c |   2 +-
 tests/time/test-time.c     | 147 -------------------------------------
 2 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 tests/time/test-time.c

diff --git a/tests/library/test-llist.c b/tests/library/test-llist.c
index c8bd00e41..12592aa4a 100644
--- a/tests/library/test-llist.c
+++ b/tests/library/test-llist.c
@@ -23,7 +23,7 @@
 //#include <string.h>
 
 #include "lib/llist.h"
-#include "src/lib/error.h"
+#include "lib/error.h"
 
 
 LUMIERA_ERROR_DEFINE(TEST, "test error");
diff --git a/tests/time/test-time.c b/tests/time/test-time.c
deleted file mode 100644
index e9d8d0550..000000000
--- a/tests/time/test-time.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-  test-time.c  -  test time and framerate functions
-
-  Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-#include "lib/time.h"
-#include "lib/framerate.h"
-
-
-LUMIERA_ERROR_DEFINE(TEST, "test error");
-
-int
-main (int argc, char** argv)
-{
-  NOBUG_INIT;
-
-  if (argc == 1)
-    return 0;
-
-  if (!strcmp(argv[1], "init"))
-    {
-      lumiera_time time;
-
-      lumiera_time_init (&time, atol (argv[2]), atol(argv[3]));
-
-      printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time));
-    }
-
-  if (!strcmp(argv[1], "todouble"))
-    {
-      lumiera_time time;
-
-      lumiera_time_init (&time, atol (argv[2]), atol(argv[3]));
-
-      printf ("%g\n", lumiera_time_double_get (&time));
-    }
-
-  if (!strcmp(argv[1], "todoublenull"))
-    {
-      printf ("%g\n", lumiera_time_double_get (NULL));
-    }
-
-  if (!strcmp(argv[1], "fromdouble"))
-    {
-      lumiera_time time;
-
-      lumiera_time_set_double (&time, atof (argv[2]));
-
-      printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time));
-    }
-
-  if (!strcmp(argv[1], "currenttime"))
-    {
-      lumiera_time time;
-
-      lumiera_time_current (&time);
-
-      printf ("%lu %lu\n", (long)lumiera_time_sec (&time), (long)lumiera_time_usec (&time));
-    }
-
-  if (!strcmp(argv[1], "add"))
-    {
-      lumiera_time time1, time2;
-
-      lumiera_time_init (&time1, 0, atol (argv[2]));
-      lumiera_time_init (&time2, 0, atol (argv[3]));
-      lumiera_time_add (&time1, &time2);
-
-      printf ("%lu %lu\n", (long)lumiera_time_sec (&time1), (long)lumiera_time_usec (&time1));
-    }
-
-  if (!strcmp(argv[1], "sub"))
-    {
-      lumiera_time time1, time2;
-
-      lumiera_time_init (&time1, 0, atol (argv[2]));
-      lumiera_time_init (&time2, 0, atol (argv[3]));
-      lumiera_time_sub (&time1, &time2);
-
-      printf ("%lu %lu\n", (long)lumiera_time_sec (&time1), (long)lumiera_time_usec (&time1));
-    }
-
-  if (!strcmp(argv[1], "ntscframefromtime"))
-    {
-      lumiera_framerate ntsc = {30000, 1001};
-      lumiera_time time;
-
-      lumiera_time_init (&time, atol (argv[2]), atol (argv[3]));
-
-      printf ("%lu\n", (long)lumiera_framerate_frame_get_time (&ntsc, &time));
-    }
-
-  if (!strcmp(argv[1], "ntscframestart"))
-    {
-      lumiera_framerate ntsc = {30000, 1001};
-      lumiera_time time;
-
-      if(lumiera_framerate_time_get_time_frame (&ntsc, &time, atol (argv[2])))
-        printf ("%lu %lu\n", (long)lumiera_time_sec(&time), (long)lumiera_time_usec(&time));
-    }
-
-  if (!strcmp(argv[1], "ntscframecheck"))
-    {
-      lumiera_framerate ntsc = {30000, 1001};
-      lumiera_time time1;
-      lumiera_time time2;
-      lumiera_framepos frame;
-
-      lumiera_framepos frame1;
-      lumiera_framepos frame2;
-
-      frame = atol (argv[2]);
-
-
-      if (lumiera_framerate_time_get_time_frame (&ntsc, &time1, frame))
-        {
-          printf("frame %lu ", frame1 = lumiera_framerate_frame_get_time (&ntsc, &time1));
-
-          lumiera_time_init (&time2, 0, 1);
-          lumiera_time_sub (&time1, &time2);
-          printf("%lu\n", frame2 = lumiera_framerate_frame_get_time (&ntsc, &time1));
-          ENSURE (frame1 == frame2+1);
-        }
-
-    }
-
-  return 0;
-}

From 024e3c4dbcd4252bc0ef318aac5b1ccc91785937 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 12 Apr 2008 04:55:18 +0200
Subject: [PATCH 32/36] change build to link in separate libs, also split test
 executable. now building  liblumiback.a liblumiproc.a liblumi.a build a
 separate test-common executable (for everything in src/common) include a
 precompiled header for assets.

---
 SConstruct                                    | 23 +++++----
 src/pre.hpp                                   |  1 +
 src/pre_a.hpp                                 | 49 +++++++++++++++++++
 src/proc/asset.hpp                            |  2 -
 src/proc/asset/db.hpp                         |  2 +
 src/proc/asset/media.hpp                      |  2 +
 src/proc/asset/meta.hpp                       |  2 +
 src/proc/asset/proc.hpp                       |  2 +
 src/proc/asset/struct.hpp                     |  2 +
 src/proc/assetmanager.hpp                     |  2 +
 tests/50components.tests                      |  2 +-
 tests/52query.tests                           |  2 +-
 .../{components => }/common/appconfigtest.cpp |  0
 .../common/customsharedptrtest.cpp            |  0
 .../common/exceptionerrortest.cpp             |  0
 .../common/factoryspecialtest.cpp             |  6 +--
 tests/{components => }/common/factorytest.cpp |  2 +-
 .../{components => common}/helloworldtest.cpp |  0
 tests/common/mainsuite.cpp                    | 42 ++++++++++++++++
 .../common/query/querydiagnostics.hpp         |  0
 .../common/query/queryutilstest.cpp           |  2 +-
 .../common/removefromsettest.cpp              |  0
 .../common/sanitizedidentifiertest.cpp        |  0
 .../common/singletonsubclasstest.cpp          |  6 +--
 .../{components => }/common/singletontest.cpp |  6 +--
 .../common/singletontestmocktest.cpp          |  0
 .../common/test/cmdlinewrappertest.cpp        |  0
 .../common/test/testoptiontest.cpp            |  0
 .../{components => }/common/testtargetobj.hpp |  0
 .../{components => }/common/typelisttest.cpp  |  0
 .../common/typelistutiltest.cpp               |  0
 .../common/visitingtoolconcept.cpp            |  0
 .../common/visitingtoolextendedtest.cpp       |  0
 .../common/visitingtooltest.cpp               |  0
 tests/components/mainsuite.cpp                | 43 +---------------
 tests/components/proc/asset/testasset.hpp     |  2 +
 .../mobject/session/defsmanagerimpltest.cpp   |  2 +
 .../proc/mobject/session/defsmanagertest.cpp  |  2 +
 .../mobject/session/defsregistryimpltest.cpp  |  2 +-
 39 files changed, 139 insertions(+), 67 deletions(-)
 create mode 100644 src/pre_a.hpp
 rename tests/{components => }/common/appconfigtest.cpp (100%)
 rename tests/{components => }/common/customsharedptrtest.cpp (100%)
 rename tests/{components => }/common/exceptionerrortest.cpp (100%)
 rename tests/{components => }/common/factoryspecialtest.cpp (99%)
 rename tests/{components => }/common/factorytest.cpp (99%)
 rename tests/{components => common}/helloworldtest.cpp (100%)
 create mode 100644 tests/common/mainsuite.cpp
 rename tests/{components => }/common/query/querydiagnostics.hpp (100%)
 rename tests/{components => }/common/query/queryutilstest.cpp (99%)
 rename tests/{components => }/common/removefromsettest.cpp (100%)
 rename tests/{components => }/common/sanitizedidentifiertest.cpp (100%)
 rename tests/{components => }/common/singletonsubclasstest.cpp (99%)
 rename tests/{components => }/common/singletontest.cpp (99%)
 rename tests/{components => }/common/singletontestmocktest.cpp (100%)
 rename tests/{components => }/common/test/cmdlinewrappertest.cpp (100%)
 rename tests/{components => }/common/test/testoptiontest.cpp (100%)
 rename tests/{components => }/common/testtargetobj.hpp (100%)
 rename tests/{components => }/common/typelisttest.cpp (100%)
 rename tests/{components => }/common/typelistutiltest.cpp (100%)
 rename tests/{components => }/common/visitingtoolconcept.cpp (100%)
 rename tests/{components => }/common/visitingtoolextendedtest.cpp (100%)
 rename tests/{components => }/common/visitingtooltest.cpp (100%)
 mode change 100644 => 120000 tests/components/mainsuite.cpp

diff --git a/SConstruct b/SConstruct
index 355f2b941..cef5ebda0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -234,18 +234,23 @@ def defineBuildTargets(env, artifacts):
         We use a custom function to declare a whole tree of srcfiles. 
     """
     
-    lumobj = ( srcSubtree(env,'$SRCDIR/backend') 
-             + srcSubtree(env,'$SRCDIR/proc')
-             + srcSubtree(env,'$SRCDIR/common')
-             + srcSubtree(env,'$SRCDIR/lib')
-             )
+    objback =   srcSubtree(env,'$SRCDIR/backend') 
+    objproc =   srcSubtree(env,'$SRCDIR/proc')
+    objlib  = ( srcSubtree(env,'$SRCDIR/common')
+              + srcSubtree(env,'$SRCDIR/lib')
+              )
     plugobj = srcSubtree(env,'$SRCDIR/plugin', isShared=True)
-    core  = env.StaticLibrary('$BINDIR/core.la', lumobj)
-    #core = lumobj # use this for linking directly
+    core  = ( env.StaticLibrary('$BINDIR/lumiback.la', objback)
+            + env.StaticLibrary('$BINDIR/lumiproc.la', objproc)
+            + env.StaticLibrary('$BINDIR/lumi.la',     objlib)
+            )
     
     # use PCH to speed up building
-    precomp = env.PrecompiledHeader('$SRCDIR/pre')
-    env.Depends(lumobj, precomp)
+    precomp = ( env.PrecompiledHeader('$SRCDIR/pre')
+              + env.PrecompiledHeader('$SRCDIR/pre_a')
+              )
+    env.Depends(objproc, precomp)
+    env.Depends(objlib, precomp)
     
     artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp']+ core )
     artifacts['plugins'] = env.SharedLibrary('$BINDIR/lumiera-plugin', plugobj)
diff --git a/src/pre.hpp b/src/pre.hpp
index 19717c2bb..203613c3d 100644
--- a/src/pre.hpp
+++ b/src/pre.hpp
@@ -31,6 +31,7 @@
  ** building the object files including this header).
  **
  ** @see mobject.hpp usage example
+ ** @see pre_a.hpp precompiled header including Asset subsystem
  */
 
 #ifndef LUMIERA_PRE_HPP
diff --git a/src/pre_a.hpp b/src/pre_a.hpp
new file mode 100644
index 000000000..34a8e72f2
--- /dev/null
+++ b/src/pre_a.hpp
@@ -0,0 +1,49 @@
+/*
+  PRE_A.hpp  -  precompiled header (including assets)
+ 
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
+                        Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+*/
+
+/** @file pre.hpp
+ ** Precompiled Header including Asset subsystem.
+ ** Assortment of standard util, error handling and basic lib-boost components,
+ ** together with the basic asset.hpp.
+ **
+ ** @see pre.hpp
+ */
+
+#ifndef LUMIERA_PRE_A_HPP
+#define LUMIERA_PRE_A_HPP
+
+
+#include <string>
+#include <vector>
+#include <map>
+#include <tr1/memory>
+#include <boost/function.hpp>
+#include <boost/format.hpp>
+#include <boost/bind.hpp>
+
+#include "lumiera.h"
+#include "proc/asset.hpp"
+
+
+#endif /*LUMIERA_PRE_A_HPP*/
diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp
index 7088b8324..ec1c64ef9 100644
--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@@ -55,8 +55,6 @@
 #define PROC_INTERFACE_ASSET_H
 
 
-#include "pre.hpp"
-
 #include "proc/asset/category.hpp"
 #include "common/error.hpp"
 #include "common/p.hpp"
diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp
index 493a188cf..cb32868d7 100644
--- a/src/proc/asset/db.hpp
+++ b/src/proc/asset/db.hpp
@@ -25,6 +25,8 @@
 #define ASSET_DB_H
 
 
+#include "pre_a.hpp"
+
 #include "proc/asset.hpp"
 #include "common/error.hpp"
 
diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp
index ce43d6231..4e122cd53 100644
--- a/src/proc/asset/media.hpp
+++ b/src/proc/asset/media.hpp
@@ -35,6 +35,8 @@
 #ifndef ASSET_MEDIA_H
 #define ASSET_MEDIA_H
 
+#include "pre_a.hpp"
+
 #include "proc/asset.hpp"
 #include "common/factory.hpp"
 #include "proc/mobject/mobject.hpp"
diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp
index 89500c226..02be992db 100644
--- a/src/proc/asset/meta.hpp
+++ b/src/proc/asset/meta.hpp
@@ -36,6 +36,8 @@
 #ifndef ASSET_META_H
 #define ASSET_META_H
 
+#include "pre_a.hpp"
+
 #include "proc/asset.hpp"
 #include "common/factory.hpp"
 
diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp
index 12e69812c..05eca4ddf 100644
--- a/src/proc/asset/proc.hpp
+++ b/src/proc/asset/proc.hpp
@@ -35,6 +35,8 @@
 #ifndef ASSET_PROC_H
 #define ASSET_PROC_H
 
+#include "pre_a.hpp"
+
 #include "proc/asset.hpp"
 #include "common/factory.hpp"
 
diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp
index df6c5f1f6..7c4c4367b 100644
--- a/src/proc/asset/struct.hpp
+++ b/src/proc/asset/struct.hpp
@@ -37,6 +37,8 @@
 #ifndef ASSET_STRUCT_H
 #define ASSET_STRUCT_H
 
+#include "pre_a.hpp"
+
 #include "proc/asset.hpp"
 #include "common/query.hpp"
 #include "common/factory.hpp"
diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp
index 610e0d1dc..22138065d 100644
--- a/src/proc/assetmanager.hpp
+++ b/src/proc/assetmanager.hpp
@@ -36,6 +36,8 @@
 #define PROC_INTERFACE_ASSETMANAGER_H
 
 
+#include "pre_a.hpp"
+
 #include "proc/asset.hpp"
 #include "common/error.hpp"
 #include "common/singleton.hpp"
diff --git a/tests/50components.tests b/tests/50components.tests
index d2d38e5d0..63e97cf9a 100644
--- a/tests/50components.tests
+++ b/tests/50components.tests
@@ -1,4 +1,4 @@
-TESTING "Component Test Suite: common and basic components" ./test-components --group=common
+TESTING "Component Test Suite: common and basic components" ./test-common --group=common
 
 
 
diff --git a/tests/52query.tests b/tests/52query.tests
index 2c598b3b0..799875d7b 100644
--- a/tests/52query.tests
+++ b/tests/52query.tests
@@ -1,4 +1,4 @@
-TESTING "Proc Layer config rules Test Suite" ./test-components --group=query
+TESTING "Proc Layer config rules Test Suite" ./test-common --group=query
 
 
 
diff --git a/tests/components/common/appconfigtest.cpp b/tests/common/appconfigtest.cpp
similarity index 100%
rename from tests/components/common/appconfigtest.cpp
rename to tests/common/appconfigtest.cpp
diff --git a/tests/components/common/customsharedptrtest.cpp b/tests/common/customsharedptrtest.cpp
similarity index 100%
rename from tests/components/common/customsharedptrtest.cpp
rename to tests/common/customsharedptrtest.cpp
diff --git a/tests/components/common/exceptionerrortest.cpp b/tests/common/exceptionerrortest.cpp
similarity index 100%
rename from tests/components/common/exceptionerrortest.cpp
rename to tests/common/exceptionerrortest.cpp
diff --git a/tests/components/common/factoryspecialtest.cpp b/tests/common/factoryspecialtest.cpp
similarity index 99%
rename from tests/components/common/factoryspecialtest.cpp
rename to tests/common/factoryspecialtest.cpp
index ecf293cd9..eaf50fe42 100644
--- a/tests/components/common/factoryspecialtest.cpp
+++ b/tests/common/factoryspecialtest.cpp
@@ -21,12 +21,12 @@
 * *****************************************************/
 
 
-#include "common/testtargetobj.hpp"
-#include "common/factory.hpp"
-
 #include "common/test/run.hpp"
 #include "common/util.hpp"
 
+#include "testtargetobj.hpp"
+#include "common/factory.hpp"
+
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/common/factorytest.cpp b/tests/common/factorytest.cpp
similarity index 99%
rename from tests/components/common/factorytest.cpp
rename to tests/common/factorytest.cpp
index 6c96a337c..bde121a8c 100644
--- a/tests/components/common/factorytest.cpp
+++ b/tests/common/factorytest.cpp
@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "common/testtargetobj.hpp"
+#include "testtargetobj.hpp"
 
 #include "common/test/run.hpp"
 #include "common/factory.hpp"
diff --git a/tests/components/helloworldtest.cpp b/tests/common/helloworldtest.cpp
similarity index 100%
rename from tests/components/helloworldtest.cpp
rename to tests/common/helloworldtest.cpp
diff --git a/tests/common/mainsuite.cpp b/tests/common/mainsuite.cpp
new file mode 100644
index 000000000..aa500cdbe
--- /dev/null
+++ b/tests/common/mainsuite.cpp
@@ -0,0 +1,42 @@
+/*
+  mainsuite.cpp  -  "the" Lumiera self test suite
+
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
+                        Hermann Vosseler <Ichthyostega@web.de>
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#include "common/test/suite.hpp"
+#include "common/test/testoption.hpp"
+
+/** run all tests or any single test specified in the first
+ *  cmd line argument.
+ *  Note: to ease debugging, we don't catch any exceptions. 
+ */
+int main (int argc, char* argv[])
+{
+  util::Cmdline args (argc,argv);
+  test::TestOption optparser (args);
+  test::Suite suite (optparser.getTestgroup());
+  
+  if (optparser.getDescribe())
+    suite.describe();
+  else
+    suite.run (args);
+  return 0;
+}
diff --git a/tests/components/common/query/querydiagnostics.hpp b/tests/common/query/querydiagnostics.hpp
similarity index 100%
rename from tests/components/common/query/querydiagnostics.hpp
rename to tests/common/query/querydiagnostics.hpp
diff --git a/tests/components/common/query/queryutilstest.cpp b/tests/common/query/queryutilstest.cpp
similarity index 99%
rename from tests/components/common/query/queryutilstest.cpp
rename to tests/common/query/queryutilstest.cpp
index 05cfab7ef..fc5e914a9 100644
--- a/tests/components/common/query/queryutilstest.cpp
+++ b/tests/common/query/queryutilstest.cpp
@@ -26,7 +26,7 @@
 
 #include "common/cmdline.hpp"
 #include "common/query.hpp"
-#include "common/query/querydiagnostics.hpp"
+#include "query/querydiagnostics.hpp"
 
 #include <boost/bind.hpp>
 #include <iostream>
diff --git a/tests/components/common/removefromsettest.cpp b/tests/common/removefromsettest.cpp
similarity index 100%
rename from tests/components/common/removefromsettest.cpp
rename to tests/common/removefromsettest.cpp
diff --git a/tests/components/common/sanitizedidentifiertest.cpp b/tests/common/sanitizedidentifiertest.cpp
similarity index 100%
rename from tests/components/common/sanitizedidentifiertest.cpp
rename to tests/common/sanitizedidentifiertest.cpp
diff --git a/tests/components/common/singletonsubclasstest.cpp b/tests/common/singletonsubclasstest.cpp
similarity index 99%
rename from tests/components/common/singletonsubclasstest.cpp
rename to tests/common/singletonsubclasstest.cpp
index aad667b9f..cdbdd6934 100644
--- a/tests/components/common/singletonsubclasstest.cpp
+++ b/tests/common/singletonsubclasstest.cpp
@@ -21,12 +21,12 @@
 * *****************************************************/
 
 
-#include "common/testtargetobj.hpp"
-#include "common/singletonsubclass.hpp"
-
 #include "common/test/run.hpp"
 #include "common/util.hpp"
 
+#include "testtargetobj.hpp"
+#include "common/singletonsubclass.hpp"
+
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/common/singletontest.cpp b/tests/common/singletontest.cpp
similarity index 99%
rename from tests/components/common/singletontest.cpp
rename to tests/common/singletontest.cpp
index b531d7e9c..9960ff911 100644
--- a/tests/components/common/singletontest.cpp
+++ b/tests/common/singletontest.cpp
@@ -21,12 +21,12 @@
 * *****************************************************/
 
 
-#include "common/testtargetobj.hpp"
-
 #include "common/test/run.hpp"
-#include "common/singleton.hpp"
 #include "common/util.hpp"
 
+#include "testtargetobj.hpp"
+#include "common/singleton.hpp"
+
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/common/singletontestmocktest.cpp b/tests/common/singletontestmocktest.cpp
similarity index 100%
rename from tests/components/common/singletontestmocktest.cpp
rename to tests/common/singletontestmocktest.cpp
diff --git a/tests/components/common/test/cmdlinewrappertest.cpp b/tests/common/test/cmdlinewrappertest.cpp
similarity index 100%
rename from tests/components/common/test/cmdlinewrappertest.cpp
rename to tests/common/test/cmdlinewrappertest.cpp
diff --git a/tests/components/common/test/testoptiontest.cpp b/tests/common/test/testoptiontest.cpp
similarity index 100%
rename from tests/components/common/test/testoptiontest.cpp
rename to tests/common/test/testoptiontest.cpp
diff --git a/tests/components/common/testtargetobj.hpp b/tests/common/testtargetobj.hpp
similarity index 100%
rename from tests/components/common/testtargetobj.hpp
rename to tests/common/testtargetobj.hpp
diff --git a/tests/components/common/typelisttest.cpp b/tests/common/typelisttest.cpp
similarity index 100%
rename from tests/components/common/typelisttest.cpp
rename to tests/common/typelisttest.cpp
diff --git a/tests/components/common/typelistutiltest.cpp b/tests/common/typelistutiltest.cpp
similarity index 100%
rename from tests/components/common/typelistutiltest.cpp
rename to tests/common/typelistutiltest.cpp
diff --git a/tests/components/common/visitingtoolconcept.cpp b/tests/common/visitingtoolconcept.cpp
similarity index 100%
rename from tests/components/common/visitingtoolconcept.cpp
rename to tests/common/visitingtoolconcept.cpp
diff --git a/tests/components/common/visitingtoolextendedtest.cpp b/tests/common/visitingtoolextendedtest.cpp
similarity index 100%
rename from tests/components/common/visitingtoolextendedtest.cpp
rename to tests/common/visitingtoolextendedtest.cpp
diff --git a/tests/components/common/visitingtooltest.cpp b/tests/common/visitingtooltest.cpp
similarity index 100%
rename from tests/components/common/visitingtooltest.cpp
rename to tests/common/visitingtooltest.cpp
diff --git a/tests/components/mainsuite.cpp b/tests/components/mainsuite.cpp
deleted file mode 100644
index aa500cdbe..000000000
--- a/tests/components/mainsuite.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  mainsuite.cpp  -  "the" Lumiera self test suite
-
-  Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
-                        Hermann Vosseler <Ichthyostega@web.de>
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-#include "common/test/suite.hpp"
-#include "common/test/testoption.hpp"
-
-/** run all tests or any single test specified in the first
- *  cmd line argument.
- *  Note: to ease debugging, we don't catch any exceptions. 
- */
-int main (int argc, char* argv[])
-{
-  util::Cmdline args (argc,argv);
-  test::TestOption optparser (args);
-  test::Suite suite (optparser.getTestgroup());
-  
-  if (optparser.getDescribe())
-    suite.describe();
-  else
-    suite.run (args);
-  return 0;
-}
diff --git a/tests/components/mainsuite.cpp b/tests/components/mainsuite.cpp
new file mode 120000
index 000000000..3c6dd11cb
--- /dev/null
+++ b/tests/components/mainsuite.cpp
@@ -0,0 +1 @@
+../common/mainsuite.cpp
\ No newline at end of file
diff --git a/tests/components/proc/asset/testasset.hpp b/tests/components/proc/asset/testasset.hpp
index e1abc57d2..9ba16a4e6 100644
--- a/tests/components/proc/asset/testasset.hpp
+++ b/tests/components/proc/asset/testasset.hpp
@@ -25,6 +25,8 @@
 #define ASSET_TESTASSET_H
 
 
+#include "pre_a.hpp"
+
 #include "proc/asset.hpp"
 //#include "common/util.hpp"
 
diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
index 8aa773d5f..85f1c088c 100644
--- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
@@ -21,6 +21,8 @@
 * *****************************************************/
 
 
+#include "pre_a.hpp"
+
 #include "common/test/run.hpp"
 #include "common/util.hpp"
 
diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp
index 5f5ed686e..8c819c7f2 100644
--- a/tests/components/proc/mobject/session/defsmanagertest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagertest.cpp
@@ -21,6 +21,8 @@
 * *****************************************************/
 
 
+#include "pre_a.hpp"
+
 #include "common/test/run.hpp"
 #include "common/util.hpp"
 
diff --git a/tests/components/proc/mobject/session/defsregistryimpltest.cpp b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
index b67b6cbe2..0aae90b3a 100644
--- a/tests/components/proc/mobject/session/defsregistryimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
@@ -28,7 +28,7 @@
 #include "common/factory.hpp"
 #include "common/query.hpp"
 
-#include "common/query/querydiagnostics.hpp"
+#include "../common/query/querydiagnostics.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/format.hpp>

From e91fc65a2bb5a4b91350b841bd54ef5f561b78d2 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 12 Apr 2008 06:59:24 +0200
Subject: [PATCH 33/36] supplemented some info to the wikis

---
 wiki/compatibility.html |  41 ++--
 wiki/index.html         | 438 +++++++++++++++++++++++++++++++++++++++-
 wiki/todo.html          |  55 ++++-
 3 files changed, 503 insertions(+), 31 deletions(-)

diff --git a/wiki/compatibility.html b/wiki/compatibility.html
index ad54ca4e8..979f2301c 100644
--- a/wiki/compatibility.html
+++ b/wiki/compatibility.html
@@ -747,29 +747,40 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 }
 //}}}</pre>
 </div>
-<div title="BuildDependencies" modifier="CehTeh" modified="200804011825" created="200803261326" changecount="3">
+<div title="BuildDependencies" modifier="Ichthyostega" modified="200804120311" created="200803261326" changecount="7">
 <pre>! Programming Languages
- * C
-  a C99 compatible compiler, some GCC extensions are used, most are optional.
- * C++
-  C++98 with some boost and tr1 additions
- * bash
+* C
+** a C99 compatible compiler, some GCC extensions are used, most are optional.
+* C++
+** C++98
+** std::tr1 (for &lt;std::tr1::memory&gt;)
+** BOOST ~~(below are the DEBIAN package names)~~
+*** libboost-dev (=1.34.1-2)
+*** libboost-program-options-dev (=1.34.1-2)
+*** libboost-program-options1.34.1 (=1.34.1-2) ''NOTE: binary lib dependency''
+*** libboost-regex-dev (=1.34.1-2)
+*** libboost-regex1.34.1 (=1.34.1-2) ''binary lib depenency''
+** //usually, newer versions are OK//
+
+* bash
   some build scripts (test.sh, ..) use bash specific extensions
 
 ! Build Tools
- * scons
- * autotools
- * Doxygen
- * test.sh (included)
+* autotools
+* SCons
+** //need either autotools or scons//
+** SCons (0.96.90), Python (2.3)
+* Doxygen
+* test.sh (included)
 
 ! Extra tools
- * git
- * bouml
+* git
+* bouml
 
 ! Libraries
- * boost
- * NoBug
- * gavl
+* boost (see above)
+* NoBug
+* gavl
 </pre>
 </div>
 <div title="ColorPalette" modifier="CehTeh" modified="200803261254" created="200803261252" changecount="5">
diff --git a/wiki/index.html b/wiki/index.html
index 7a4d039ca..1ed553afd 100755
--- a/wiki/index.html
+++ b/wiki/index.html
@@ -930,9 +930,11 @@ git push git://git.pipapo.org/lumiera/mob
 
 lumiera/mob is an anonymous account at pipapo.org where everyone can commit changes. </pre>
 </div>
-<div title="IRC-Transcripts" modifier="Ichthyostega" modified="200802021818" created="200708120209" tags="discuss irclog" changecount="7">
+<div title="IRC-Transcripts" modifier="Ichthyostega" modified="200804120322" created="200708120209" tags="discuss irclog" changecount="8">
 <pre>We keep a protocol or short summary of each important discussion. The summaries of the monthly developer meetings are posted to the Mailinglist and can be found on pipapo.org too
 
+* [[04-08 developer meeting 3.Apr.2008|IRC_2008-04-03]]
+* [[03-08 developer meeting 6.Mar.2008|IRC_2008-03-06]]
 * [[1.official developer meeting 1.Feb.2008|IRC_2008-02-01]]
 * [[informal developer meeting 10.Aug.2007|IRC_2007-08-10]]
 </pre>
@@ -1028,6 +1030,422 @@ Let's say, we need a person volonteering to guide/moderate the selection, going
 * should have one of the free top level domains (.net, .org)
 * should be compatible with educational institutions (sorry, no pr0nedit :)
 * should not obviously collide with trade marks
+</pre>
+</div>
+<div title="IRC_2008-03-06" modifier="Ichthyostega" modified="200804120331" created="200804120326" tags="irclog excludeMissing" changecount="3">
+<pre>! 6. mar.2008 on #openvideo
+21:00 - 23:30 GMT, __Participants__:
+* hermanr
+* cehteh
+* ichthyo
+* Plouj
+* SimAV
+* akirad
+* _MMA_
+* rgareus
+* ddennedy
+* edrz
+* anewcomb
+* gmerlin
+* oracle2025
+* gisle
+
+! Boilerplate
+!! Organization of this meeting
+* cehteh writes the protocol
+* hermanr does chairman
+
+!! Leftovers from last meeting
+We concluded there are no leftovers
+
+! Go through Ideas and Drafts in design process
+
+!! Idea: time_handling
+http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/time_handling
+
+Point 1 is superseded by using gavl.
+
+Points 2 and 3 are still valid.
+
+''Ichthyo'' asked gmerlin if there are any problems according gavl for the points 2 (position of frames) and 3 (position for keyframes and automation). Gmerlin acknowledges that he doesnt see any problems.
+
+''Oracle2025'' brings interlacing on topic &quot;are you aware that automations and keyframes could/should also apply to fields?&quot;. We agree that this must be handled &quot;in interlacing, a frame is a pair of 2 subsequent fields&quot;.
+
+__Conclusion__:
+ Refactor the proposal according to the discussion and work it out, make it draft then. Discuss about it on the next meeting
+
+!! Idea: Unit tests in Python
+http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/UnitTests_Python
+
+We have a testsuite based on cehtehs 'test.sh' which superseedes this proposal.
+
+__Conclusion__:
+ Drop it.
+
+!! Idea: Todo Lists
+http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/TodoLists
+
+This Idea is in a very early state an not yet mature.&lt;br/&gt;
+''Cehteh'' explains: &quot;I want something which doesn't need much human care and i want one big 'milestones' thing and a small 'mini-task' thing&quot;. Ichthyo refines this as &quot;Roadmap&quot; and &quot;Near time task list&quot;. We agree that this shall not be too strict. There are some ideas floating, like adding this things to the testsuite or use the wiki. Ichthyo shows how he uses the tiddlywiki's task macro ([[renderengine.html#PlanningNodeCreatorTool]]). He likes it but doubts its usefulness when it is used without guessing the hours/days of work.
+
+__Conclusion__:
+ We use the Tiddlywiki task macro thing for now.
+
+!! Draft: CCodingStyleGuide
+http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/CCodingStyleGuide
+
+Ichthyo tells that the discussion on the wiki page made this clear now. Cehteh explains that he uses this style with success for diffrent projects. We make clear that this is meant for C, in C++ we use namespaces. Overall we agree that code shall be self-documenting.
+
+__Conclusion__:
+ Make it final.
+
+!! Draft: DevelopmentFramework
+http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/DevelopmentFramework
+
+Cehteh explains that he will transfer this propoal to a tiddlywiki covering compatibility guides and dependencies. We conclude that this wiki must reflect the actual practice (NoBug, Doxygen, test.sh) despite the proposal is not concrete yet.
+
+A short discussion about build systems came up, we still use autotools and scons in parallel, delaying the decision later. oracle2025 mentioned that scons could be used for development and autotools for release. No decision about that everyone has different opinions. But we agree that it works as is.
+
+__Conclusion__:
+ Cehteh will make the proposed wiki which shall be maintained to reflect the state and this topic will be finalized by that.
+
+!! Draft: Skills Collection
+http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/SkillsCollection
+
+This might be only useful if there are more developers working on the project.
+
+__Conclusion__:
+ Leave in draft state for now.
+
+!! Draft: Architecture Overview
+http://www.pipapo.org/pipawiki/Lumiera/DesignProcess/ArchitectureOverview
+
+Ichthyo drawn a diagram showing the planned architecture. Cehteh raises concerns about codecs/plugins/effects in backend. After that there was some discussion about details. Cehteh suggests to place plugins in a extra box, gmerlin suggests that 'plugins' don't fit into the diagram, there should be &quot;filters&quot;, &quot;sources&quot;,..; Followed by some more discussion, showing that we basically agree and understand the design but the drawing needs some refinements.
+
+__Conclusion__:
+ Good idea, needs some refinements, work in progress.
+
+
+! Call for Design
+
+Ichthyo explains that he wants the overall design a bit more formalized. He put this topic on the agenda to remind that we have to work it out in DesignProcess and already started to make some design proposals.
+
+__Conclusion__:
+ Things need to be worked out in DesignProcess, take a look and review it.
+
+! Naming
+
+Raffa, Velmont, goibhniu and others collected and managed proposed names past weeks which finally ended in a community voting. Results are at http://www.cs.cornell.edu/w8/~andru/cgi-perl/civs/results.pl?id=E_9fad0d1d10c23d38
+''Lumiera'' won, Lumiera.org is free and no one of in this meeting has objections against this name. Velmont offers to register and pay for the lumiera.org domain which will be hosted on our own server (see topic below). Hermanr raises concerns if it is ok when the name is registered on another site and by another person than the server, cehteh explains that he like this distribution where doable and no one other objects. Ichthyo asks about a short name for Lumiera which will be used for C++ namespaces and such kinds. After a short discussion we agree that we use the full name and no abbreviation. We now have to rename the source and the wiki. Anyone renames the sourcecode where he is responsible for. Cehteh will go over the pipapo.org wiki and rename things.
+
+Finally we express our great thanks to the people who put the efforts into the name selection, thanks raffa, Velmont, goibhniu &amp; co.
+
+__Conclusion__:
+ ''Projectname is Lumiera'', we have a lot things to rename.
+
+! Project Server, setup, organization, administration
+Some people gathered together and rented a server at 'hetzner.de' which will host some free project pages and personal sites. Cehteh is the one who signed for the server and officially respobsible for it.
+
+The server is split into isolated 'vservers' which are created as needed. Idea is to work cooperatively to get the best out of its resources.
+
+For our projects (cinelerra.org and lumiera.org) we now need volunteers who help setting it up and administrating things. Velmont offered to help with lumiera.org, hermanr takes care of cinelerra.org, raffa will help with maintaining the webpages. oracle2025 will care for developer chroots, build and test environments. cehteh will make a page on pipapo.org which reflects the current server setup http://www.pipapo.org/pipawiki/RootServerSetup . There are still a lot jobs to do!
+
+Cehteh asked about how to manage emergency root access on the host/root server when he is unreachable. There where several suggestions between one root key for all who pay for the server to shared key schemes. We finally agreed that anyone who payed for the server can send a ssh key to ssh to be registered for emergency access.
+
+The concrete server setup will be worked out next days. Ideas are one frontend proxy and a shared nameserver. A shared nameserver, A developer vserver shared between all developers. Maybe a shared mail server.
+
+Hermanr asked about how to handle distribution of large media files. There was some discussion about bittorrent vs http. We concluded to work that out as needed.
+
+In the forthcoming discussion about cehteh stresses that &quot;it is a public server, if you place confidential information unencrypted on it, its you fault&quot;. Ssh keys shall be kept secret by the users but we can't enforce policies on those.
+
+Ichthyo asks about how to setup lumiera.org (wiki?), oracle2025 suggests webgit, cehteh explains that webgit isn't ready yet but should be useable in a few days (pipapo.org will use that too). Velmont suggest a 'real' website for the time when non-developers want to use it. Git will be set up on lumiera.org the same way as it is currently set up on pipapo.org.
+
+Hermanr asked Velmont about some help moving the bugs.cinelerra.org over, this might be little challenging since it needs an MTA and other things.
+
+Ichthyo asks about keeping the Lumiera project pages on pipapo.org until the server is ready, this is ok.
+
+__Conclusions__:
+ We have our own server which now needs volunteers for maintenance. The projects will slowly move there, until ready Lumiera stays on pipapo.org.
+
+
+! GPL3 pros cons, license rationale
+
+Ichthyo and cehteh would like to investigate a license change to GPLv3, neither of us has experience with problems this
+might raise. Questions are if we lock us out from potential libraries which are GPLv2 only or lock out possible contributors because of unforeseen patent clauses. The others here thinking that &quot;GPLv2 or later&quot; would be most-compatible. Gmerlin tells that he uses some &quot;GPLv2 only&quot; mplayer code in gavl which is itself &quot;GPLv2 or later&quot;. Cehteh explains that &quot;GPLv2 only&quot; code is a problem, where &quot;GPLv2 or later&quot; is not. Ichthyo raises concerns that the Support library may need to be LGPL, cehteh mentions that it would likely be enough if we only apply that to the plugin-loader. After all it turns out that there is a lot of confusion, misunderstanding and interpretation used with licenses and no one of us knows for sure. Finally we conclude that the interpretation and license enforcement is ruled by the copyright owner.
+
+__Conclusion__:
+ Learn more about GPLv3, use GPLv2 or later and propose to switch to GPLv3 when we are ready to do public beta releases when possible.
+
+
+! Next meeting
+
+The next meeting will be at thuesday 3rd april 21:00GMT (if not rescheduled see below).
+
+Ichthyo tells that Martin Ellison wrote he couldn't attend because of the time. So again we made a short discussion about changing/alternating timings to allow people in downunder/japan to attend. They have to speak up an make time suggestions.
+
+Conclusion:
+ Next meeting 3rd april 21:00GMT. But Aussies, please speak up if you want the time changed!
+</pre>
+</div>
+<div title="IRC_2008-04-03" modifier="Ichthyostega" created="200804120337" tags="irclog excludeMissing" changecount="1">
+<pre>! 3. apr.2008 on #lumiera
+21:00 - 23:30 GMT. __Participants__:
+ * cehteh
+ * gmerlin
+ * hermanr
+ * ichthyo
+ * joelholdsworth
+ * johncoswell
+ * rgareus
+ * sakalli
+
+! Boilerplate
+!! Organization of this meeting
+ * sakalli writes the protocol, ichthyo will help reviewing it
+
+!! Recurring Topics
+We concluded there are no leftovers and currently no Drafts from the design process to discuss
+
+! Call for volunteers
+(which tasks are to do, how can we interest people...?)
+
+There was a sense that there are people willing to help but they might need direction or cannot do actual coding. But there is also a lot of tasks that could be done by beginners and non-programmers. These tasks are important and if someone who is not a programmer is willing to take them on that leaves more time for the programmers. Examples of such tasks:
+* Protocol writing
+* maintaining to do lists and isolating tasks
+* constant code and documentation review
+* unit/functional testing
+* header file &quot;task force&quot; - some fundamentals discussed by the developers on libopenvideo should find their way into basic .h files
+* installing and maintaining project tracking and automated builds/tests on the server
+
+See http://www.lumiera.org/wiki/todo.html#Tasks
+
+It was also noted that at current phase some basic development is still needed before we can accommodate a large number of coders doing small tasks and for now we need some subsystem owners. For GUI for example.
+
+To make it easier for &quot;beginners&quot; to get aquainted with the program it was decided that one ''official Lumiera GIT repository'' should be established.
+
+
+! Project announcements/registration
+(freshmeat, gnu, etc...) any takers?
+
+The discussion was about advertising the project on various sites. There were some concerns raised that it is too early to do too much publicity at the moment. That the right time should be shortly before the first public release. But there is also some value in registering to the project in planning/alpha stage to interest people such as prospective coders. It was noted that the [http://www.linux.com/feature/126441 article on linux.com] resulted in a lot of people contacting ichthyo and cehteh. [http://plot.bek.no/pipermail/piksel/2008-January/003328.html &quot;I believe in Cinelerra&quot;] by Leo Germani also generated a lot of traffic by developers. Some level of presence on mailing lists would be good although not too much just enough to indicate the project is going on.
+
+__Conclusion__: volunteer needed to coordinate publicity (not overly urgent, but helpful)
+
+
+! Informal talk about the GUI
+
+Firstly, as SimAV was not able to be present during the meeting a proposal by him was relayed by Ichthyo: GUI and backend should be completely separated and communicate via pipes. It was agreed that the GUI should be detached but some higher level message protocol rather than bare pipes should be used. Some comments:
+* cehteh standalone gui is a nice to have, but implementation details have to be worked out
+* gmerlin Video playback can be separated in a separate X connection
+* cehteh suggests to start with an conventional, attached gui and just keep it in mind to make it detachable later
+* rgareus IMHO you want to share memory for the video-frame buffer beween the player and backend - with pipes you'll go the video-jack way.
+
+''joelholdsworth'' is a new developer in the group and had showed interest in developing the GUI. he stated that he is interested in seeing a GUI that uses popular toolkits and that plays by the standards to create a consistent UI with the rest of the free desktop. For this reason he was advocating using  GTKmm. There was no direct objections to GTKmm. Generally, there seems some preference for GTK. (Note this doesn't mean GNOME). Cehteh advocates the idea to use Lua-gtk, i.e. writing the GUI in a clean and lightweight scripting language.
+
+Cario was suggested to be used for implementing the canvas in the timeline view. 
+
+
+
+The gui should provide a skeleton. Timeline and canvas should be controllable and extensible by plugins. Tracks can be nested. Use tiling windows and dockeable views and tools palettes. For example some configuration within session/renderpipeline may cause some pluggable elements to be added to the gui. A fader or a toggle/icon and so forth. Some plugins might render additional output (e.g. in previews). A video track renders thumbnails, automation curves on top.
+
+Workflow is another important aspect to take into account in the design. A lot of information needs to come from editors and users in the design process. Different thoughts about the workflow:
+* Should not make a predefined workflow. Just produce a tool that can be adapted to different workflows. It can be predefined, but should not be fixed.
+* We dont have the resources to develop a &quot;workflow&quot; in the formal manner, we will go the &quot;propose and comment&quot; route.
+* We should take the best ideas from popular competing products such as Final Cut Pro, AVID, Premiere plus After Effects.
+
+Customisation is deemed important. Some points brought up in the discussion:
+* sakalli: would be great if we could provide a fcp configuration and a avid configuration besides the default configuration as well. That could lure a lot of users quickly. On the other side, too much flexibility can be be a problem as well. 
+* cehteh: yes .. but such things are prolly costly to setup .. we need volunteers for anything optional
+* Customization should be possible without recompile, but not too cheap.
+* There should be a working skeleton or some fixed anchor but gui operations should be bound to a scripting language to achieve customization.
+* The whole gui in a script with some performance critical widgets coded in C/C++
+* Some parts should just be customizable, other parts should be kept fixed.
+* cehteh suggested to start out by making a 'high level' description with no language/toolkit in mind .. what widgets do we need etc and after that to work on the skeleton mockup.
+* cehteh / hermanr: Lumiera should allow to choose theme independently from desktop .. because what you have as your desktop-theme doesn't suit for video editing in many cases ... see ardour
+
+ichthyo brings up the role of customization for the middle layer and gives an overview of his plans for the new participants. :
+He had good experiences with a rule based aproach in various projects. He wants to embed a Prolog interpreter that can answer to &quot;configuration queries&quot;.  There is a &quot;builder&quot; component in the middle layer to derive the render nodes graph based on a &quot;high level model&quot;, which is visible to the user (in the GUI) and based on these configuration queries.
+
+Rationale for using prolog is: The rules are very readable because they rather represent facts and relations, not the way &quot;how dings are done&quot; but the way &quot;how things are related&quot;. Example: how to configure some effects when the footage is interlaced. Additionally, we want to have some global swithces, which could control these rules, like &quot;I want maximum quality&quot;, or &quot;I want as much as possible set up automatically&quot;. The prolog rules are stored in the session and can be editd by advanced users. Of course, there is a set of basic rules. This aspect of customisation isn't exactly a GUI issue but it would have consequences for the GUI.
+
+some discussion:
+* joelholdsworth: so we just need a way of exposing properties. This is reasonably straightforward when all you want is value, colour, string etc.
+* rules within the middle layer/session could bind to some properties exposed in the GUI
+* gmerlin joelholdsworth: Agree, but point out that this can become difficult
+* cehteh joelholdsworth: skeleton and plugins who attach into some gui areas, so you can add custom widgets
+* ichthyo: also the ability to attach &quot;tags&quot; to various objects, so the rules can bind on those tags
+* cehteh: maybe a standard set of widgets, not really completely custom ones (gmerlin agrees)
+* joelholdsworth: probably you need to be able to do both well
+* joelholdsworth in many apps the value/colour/string set works perfectly well, but in luminierra the controls will likely need to be much richer
+
+Some brainstorming points about usability:
+* We need a realy good bezier widget for all sorts of curves.
+* Faders that can be grabbed everywhere are nice like  like ardours and Blender faders. Or others which have no big knob 
+* The controls in blender's node view would be a good modal to copy (not advocating GL UI, just using widgets and concepts).
+
+One extra point:
+* we have agreed to make all of the big interfaces between the layers as plain C interfaces, because this is the most widely supported common denominator.
+
+!!!! GUI CONCLUSION
+* ''joelholdsworth'' is now the official GUI maintainer for Lumiera!
+* sakalli, hermanr, ichthyo announced interest in contributing to discussions about GUI, workflows and usability. gmerlin noted that he knows some gtk secrets and is willing to help out here too.
+
+
+! Froscon application
+[http://www.froscon.org/ Froscon] is a small nice german open source exhibition that is very very technical oriented. Cehteh will be there as well as Ichthyo. Question is wether we should have a booth, perhaps together with some other interested media projects. Could ask Richard and the ffmpeg/mplayer people. End of call for papers is in june.
+
+We made no decision about official presence but most likely there will be a developer meeting if nothing else.
+
+
+! Timecode metadata discussion
+This Discussion started out on the libopenvideo list: The question was wether we agree on one uniform format solution from decoder up to app level regarding timecode. And what this format would be: arithmetic or struct type. Regarding metadata (including type of timecode) the question is if we should work out a rather fixed data format, or go the route towards rather open description records.
+
+__Conclusion__: Gmerlin does it the way it fits best for within the decoder, and Lumiera uses a more uniform time format for representing timecode in the higher app layers. Conversion functions will be concentrated in a library. Regarding metadata we will investigate further.
+
+//A (shortended) digest of the timecode and metadata discussion is attached below//
+
+! Next meeting
+
+The next meeting will be at thuesday 8th may 21:00GMT
+
+-----------------------------
+
+!!!! Timecode discussion
+{{{
+12:51 cehteh gmerlin: did you read my last mail about generalization of metadata?
+12:51 cehteh key/value pairs
+12:51 gmerlin not sure about that
+12:51 cehteh i am pretty sure that i want that in lumiera
+12:52 cehteh if gavl does that for us it would be even better
+12:52 gmerlin first of all 2 different things:
+12:52 gmerlin 1. arithmetic &lt;-&gt; struct
+12:53 gmerlin 2. Generic &lt;-&gt; format specific
+12:53 cehteh arithmetic for sure
+12:53 gmerlin On the decoder API side, I want to export ideally only one type 
+12:54 gmerlin No no SMPTEXXX and ISO999908098
+12:54 cehteh will that be attached to the frames in a intrusive way?
+12:54 cehteh i rather leave the attaching up to the application
+12:54 gmerlin intrusive?
+12:55 cehteh struct frame { uint64_t timecode; }   vs...
+12:55 cehteh struct frame { struct metadata* something; }
+12:55 cehteh or even vs something done at a api level 
+12:56 gmerlin struct lumiera_video_frame { gavl_video_frame_t * f; uint64_t timecode};
+12:56 gmerlin Or add timecodes to gavl_video_frame_t
+12:57 cehteh struct lumiera_video_frame { gavl_video_frame_t * f; struct metadata* timecode_n_stuff; }
+12:57 ichthyo so I support a  struct metadata*
+12:58 cehteh ichthyo: timecodes might not be regular .. they should be optional, but anyways they dont cost when using an arithmetic type
+12:58 cehteh i mean thats the purpose of timecodes .. to tag every frame and dont make assumptions that your footage is perfect
+12:58 ichthyo but a struct metadata* would rather mean to keep it out of basic GAVL and have a libmetadata -- which may be integrated with GAVL -- right?
+12:59 cehteh someome may have stolen a frame :P
+12:59 cehteh thats gmerlins decision ... 
+12:59 gmerlin I'm against gavl integration of metadata
+12:59 gmerlin gavl has a clear scope: Number crunching
+01:00 cehteh gmerlin: you somehow have to pass it from the decoder to the application
+01:01 cehteh i would prefer to introduce some sidechannel 
+01:01 gmerlin Yes, gmerlin_avdecoder will provide a separate function for getting the next timecode
+01:01 gmerlin bgav_get_next_timecode()
+01:01 cehteh gavl_get_frame (gavl_frame* place the frame here, metadata* place metadata there)
+01:01 gmerlin or: bgav_timecode_from_pts()
+01:03 gmerlin Some higher MXF profiles allow changing timecode parameneters in one stream
+01:06 gmerlin It's sometimes impossible to separate demuxers and codecs
+01:06 gmerlin better have them together in one lib
+01:06 cehteh actually i would like to cache gavls internal states into the backend
+01:08 gmerlin Ok, so timecodes are YYYYMMDDHHMMSSFF as int64_t
+01:08 cehteh the indexing is something i prolly have some words about 
+01:09 cehteh timecodes are uint64_t as microseconds
+01:09 cehteh well for lumiera :-P
+01:10 cehteh YYYYMMDDHHMMSSFF as int64_t   isnt that much better than a struct :P
+01:11 ichthyo now, IMHO its mostly up to gmerlin to decide how it fits into GAVL
+01:11 cehteh ack
+01:11 gmerlin Not gavl
+01:11 ichthyo gmerlin?
+01:11 gmerlin gmerlin avdecoder yes.
+01:11 cehteh in lumiera we will use usecs
+01:11 ichthyo yes
+01:12 ichthyo we will have a conversion function somewhere
+01:12 gmerlin And will it include a calendar date?
+01:12 cehteh doing it only once (avdecoder-&gt;usec) makes some sense
+01:12 gmerlin usecs since when?
+01:12 ichthyo either, we get directly usecs from avdecoder, if this fits in for gmerlin,
+01:12 ichthyo or we'll get the format which works best for him and we do the conversion ourselves
+01:12 cehteh defined elsewhere
+01:12 cehteh reel-start or absolute time or whatever
+01:13 ichthyo also, what sort of timecode this was based on (drop frame or not)
+01:13 cehteh gmerlin: thats a important point .. just uint64_t does not suffice
+01:13 cehteh it needs a tag describing what kind of timecode was used
+01:14 cehteh no matter how you encode it 
+01:14 cehteh and iirc there are quite some timecodes
+01:14 ichthyo because in this respect richard was right: we need to be able to reprocuce any value 1:1 
+01:14 cehteh yep
+01:15 cehteh further i want to be able to convert between any kind of timecode in a fingersnip
+01:15 gmerlin ichthyo: and that's impossible with usecs
+01:15 cehteh gmerlin: its not
+01:15 ichthyo with usecs alone: agreed
+01:16 ichthyo with usecs + metadata it should be possible
+01:16 ichthyo modulo some extreme cases (high speed cams, weeks of footage....)
+01:16 cehteh yes .. you need framerate and other infos depending on the metadata
+01:17 cehteh you need to be careful to do the math right so that inverse functions dont drift
+01:17 gmerlin I'll export something lossless, which repduces MXF, DV and Quicktime timecodes losslessly
+01:17 gmerlin You can then do what you want with them :)
+01:17 cehteh thats why i would like to do it at only *one* place/library .. because its delicate and bugs are easier to spot/fix there
+01:18 ichthyo and then there is some api to get at the additional metadata
+01:18 cehteh yeah
+01:18 ichthyo and beyond that: lets devise a libmetadata
+01:18 cehteh just shove the data over .. YYYYMMDDHHMMSSFF as int64_t would be ok
+01:18 gmerlin Ok.
+01:18 cehteh we make a libmetadata (as part of our support lib)
+01:19 cehteh somewhat independent so that it can be spun out
+}}}
+
+!!!! about Metadata
+{{{
+01:19 cehteh gmerlin: well .. how bout other metadata
+01:19 cehteh your decoder needs to pass that too 
+01:20 gmerlin like?
+01:20 gmerlin Author, Artist title...
+01:20 cehteh some cameras encode shutter speed, focus, gain control, colour balance
+01:20 cehteh and other things
+01:20 gmerlin Hmmm
+01:20 gmerlin I think MXF exports some of these
+01:21 ichthyo wav files can have additional chunks; whats with flac?
+01:21 gmerlin flac has vorbis metadata
+01:21 ichthyo important for the more modern sound formats
+01:21 cehteh dunno .. just thinkin about pro codecs and raw film metadata
+01:21 ichthyo just wanting to point out: things to come here, 
+01:22 ichthyo e.g for sound: what stream is what channel
+01:22 gmerlin Channel locations are handles by gavl
+01:22 gmerlin If you have a multichannel stream
+01:22 cehteh well .. note that there is per-asset metadata you want to pass .. and per frame metadata
+01:22 cehteh maybe even some more undiscovered cases :)
+01:23 cehteh did someone say this is easy??
+01:23 sakalli did any of you watch the video regarding red workflow that i sent to the mailing list? redcode raw holds everyting, asa, wb, etc...  hope lumiera will be able to facilitate that as well.
+01:23 ichthyo at some point I want to be able to support ambisonics
+01:24 ichthyo and maybe some day there will be wave field sysnthesis in more broad use
+01:24 cehteh the codec in the back needs to pass us these things else we cantb handle it
+01:24 gmerlin well, the easiest would be to extend bgav_metadata_t
+01:24 ichthyo rationale is: just be open
+01:24 cehteh gmerlin: maybe we need to investigate this things more, nothing needs to be decided now
+01:24 ichthyo ack
+01:25 cehteh see my key/value metadata proposal .. at some point maybe you make a complete sidechannel just for metadata
+01:25 cehteh decoder stuffs that in on demand and it is passed along with its own api like the bgav_timecode_from_pts()
+01:26 cehteh that way you dont need to touch it more than necessary
+01:26 gmerlin shouldn't that key/value stuff be unified with plugin parameters?
+01:27 cehteh for lumiera, maybe, maybe not
+01:27 ichthyo you mean: you have a common api for describing &quot;values&quot; ?
+01:27 cehteh some plugin parameters are determined by math functions
+01:27 gmerlin You have a key, a type and a value
+01:27 cehteh maybe for caching them
+01:27 cehteh the api might be unified .. but the storage not
+01:28 gmerlin why?
+01:28 ichthyo because any block of data could be in the metadata
+01:28 cehteh metadata which belongs to the frame coming from the decoder is const
+01:28 cehteh plugin parameters are volatile
+
+01:33 gmerlin One other point (but too late for it now) are audio timecodes. I'll adress that on libopenvideo
+01:33 cehteh we will write a little more sophisticated timecode library 
+01:34 cehteh gmerlin: that should be unified :)
+}}}
+
 </pre>
 </div>
 <div title="InlineJavaScript" modifier="Jeremy" created="200603090618" tags="systemConfig" server.type="file" server.host="file:///home/ct/.homepage/home.html" server.page.revision="200603090618">
@@ -1378,7 +1796,7 @@ This distributed wiki might be used instead the pipapo.org wiki, investigate tha
 Wiki works. It is simple to use and just flexible enough to handle the task. I don't go to install any other software for such tasks on my server. While the design progresses I'd propose to move our work into git repositories and eventually phase this wiki pages out anyways. I'd rather like to start out distributed/git right away .. but git gives us only a fine storage layer, for a design process we need some good presentation layer (later when using git and starting the implementation everyones favorite editor serves for that) I have no better ideas yet to solve the presentation problem other than using this wiki (or maybe Bouml).
 </pre>
 </div>
-<div title="LumieraWiki" modifier="Ichthyostega" modified="200708170218" created="200706172308" tags="portal" changecount="29">
+<div title="LumieraWiki" modifier="Ichthyostega" modified="200804120319" created="200706172308" tags="portal" changecount="32">
 <pre>This is the entry point to several [[TiddlyWiki]]-Pages containing the developer and design documentation for Lumiera.
 
 * Cehteh started GitNotes where we will collect some information about git, howto and special setups
@@ -1389,23 +1807,25 @@ Wiki works. It is simple to use and just flexible enough to handle the task. I d
 Please __end your tiddlers in a newline__, this makes merging in git easier since the /pre tag used in tiddlywiki will become on a single line.
 
 ----
-!Design Draft
+!Architecture and Subsystems
 to get started, we create design drafts emphasizing different aspects and regions of Lumiera
 
-* Ichthyo focuses mainly on the Render Engine and its interconnection to the EDL, [[see this separate page|renderengine.html]]
-* Cehteh works on the data backend draft, see [[this page|backend.html]]
+* Cehteh works on the data backend, see [[this page|backend.html]]
+* Ichthyo focuses mainly on Edit operations and Builder, [[see this separate page|renderengine.html]]
+* Gmerlin is in charge of [[GAVL|http://gmerlin.sourceforge.net/gavl.html]] for processing of video data
+* as of 4/08 a GuiWorkingGroup is emerging...
 * Some tools which don't fit somewhere else and are used everywhere are put into a [[Support Library|support_library.html]]
-* [[Description of the Test System|TestSh]]
 
-!Coding Structures
-next we should //start thinking// on how to organize several aspects of the practical coding...
+!Coding &amp;mdash; Building &amp;mdash; Testing
+how to organize several aspects of the practical coding...
 * what to do in BOUML?                          &amp;rarr; [[more|whatInBOUML]]
 * how to organize packages, files, includes?    &amp;rarr; [[more|SrcTreeStructure]]
 * how to organize the executable to be built?
 * what coding conventions to prefer?            &amp;rarr; [[GNU Style|DesignDocumentation]]
 * what [[build system|BuildSystem]] to use?
 * various [[build dependencies|BuildDependenceis]]
-* TestSuite</pre>
+* we embrace __Test Driven Development__.       &amp;rarr; Description of [[Test System|TestSh]] and TestSuite
+</pre>
 </div>
 <div title="MainMenu" modifier="CehTeh" modified="200803281345" created="200706172305" changecount="6">
 <pre>GettingStarted
diff --git a/wiki/todo.html b/wiki/todo.html
index 7440ab36a..d6caf66be 100644
--- a/wiki/todo.html
+++ b/wiki/todo.html
@@ -1979,12 +1979,20 @@ see : &lt;&lt;tag RSSFeed&gt;&gt; for the full list.
 
 </pre>
 </div>
-<div title="RoadMap" modifier="CehTeh" modified="200804090217" created="200804011655" changecount="7">
+<div title="RoadMap" modifier="Ichthyostega" modified="200804120415" created="200804011655" changecount="12">
 <pre>! Foundations, not really a milestone yet
 
 We need following in a basically working / mockup state:
 
-* Proc layer, basic rendering, partly mockups
+* GUI
+** define a outline (most important views and modes)
+** define the foundations for communicating with the lower layers
+* Proc layer
+** basic assets, create a clip object //(done)//
+** interface/stub for ~ConfigQuery subsystem //(done)//
+** add simple clip to EDL/Session, invoke builder
+** build render nodes for very simple session (partly mockups)
+** preliminary support for composite clips (video+audio)
 * Backend
 ** File backend, caching
 ** Serializer
@@ -1996,9 +2004,19 @@ We need following in a basically working / mockup state:
 ** Testsuite
 ** Website
 
-!! Next Goals
+!!! Next Goals
 
-# Make a [[video player mockup]]</pre>
+# Make a [[video player mockup]]
+
+! Second round
+//all rather brainstorming for now, feel free to modify...//
+
+* save and load session
+* integrate YAP Prolog instead of the mock impl
+* load and wire some plugins
+* send output to a window in GUI
+
+</pre>
 </div>
 <div title="SiteSubtitle" modifier="CehTeh" created="200803281323" changecount="1">
 <pre>Roadmap and tasks</pre>
@@ -3261,9 +3279,32 @@ function addKeyDownHandlers(e)
 }
 //}}}</pre>
 </div>
-<div title="ToDo" modifier="CehTeh" modified="200804090212" created="200803281330" changecount="4">
+<div title="ToDo" modifier="Ichthyostega" modified="200804120414" created="200803281330" changecount="5">
 <pre>! Proc layer
  by ichtho
+!! Asset Manager, Asset and ~MObject
+Design roughly finished, mem management with smart-ptrs and object dependencies working, Asset Manager (automatic registry) working. Relation of Assets and MObjects needs some clarification. Object creation could use some refactoring (work in progress)
+!! Support for Media Bins, high-level Resource manager
+not even concrete plans yet. Needing a volounteer to take this subsystem
+!! Session, EDL, edit operations
+Session Manager (access point/interface) done. Basic operations (how to address objects in the EDL, how to add objects...) only drafted, need detailed design (but is difficult before the builder is more clear, so I'll probably work bottom up here)
+!! Framework for storing/loading objects
+Just a draft in a separate branch, nothing finished.
+!! Defaults Manager ~ConfigQuery subsystem
+Defaults Manager done, using a mock implementation of for config queries. Need to understand better what queries we need to support, what predicates to define, how to describe capabilities. Basically it's too early to nail down a design
+!! integrating YAP Prolog or another resolution system
+blocked because of the preceeding. But it would be possible to implement the basics (i.e. calling in, passing rule code....)
+!! create Fixture from all ~EDLs
+Design partially done, nothing implemented yet.
+!! create Partitioning of Fixture
+Some ideas; blocked because of incomplete design of the EDL
+!! Builder core
+support framework done. Design/planning of node creater tool partially done, implementation just started
+!! Render nodes
+nothing but a preliminary object hierarchy. Need to work out the interface.
+!! Automation handling
+just a draft. Need to work out interface for describing automatable &quot;parameters&quot;
+
 
 ! Backend
  by cehteh
@@ -3300,8 +3341,8 @@ will be done on the 'devel' vserver. nothing done yet.
 Someone might pickup a Doxygen-Maintainer. This is not writing actual documentation but bringing the Documentation comments in the source to a good shape, add formatting tags, ensureing that all docs are properly generated, maintaining a glossary and index, define the order etc.
 </pre>
 </div>
-<div title="video player mockup" modifier="CehTeh" modified="200804090218" created="200804090216" changecount="3">
-<pre>Use the backend, gmerlin/avdecoder and a Player widget to playback videos. This should be a small application which can open and playback many videos from on instance in parallel. Later on scrubbing for this videos might be supported.
+<div title="video player mockup" modifier="Ichthyostega" modified="200804120416" created="200804090216" changecount="4">
+<pre>Use the backend, gmerlin/avdecoder and a Player widget to playback videos. This should be a small application which can open and playback many videos from one instance in parallel. Later on scrubbing for this videos might be supported.
 
 The idea here is to show and measure backend and scheduler performance and beeing a proof of concept for the design. It will run independent of the Proc layer but needs quite some work on the backend to be done.</pre>
 </div>

From ce72947d0cb5fd378d6c20406623941b7962424c Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 13 Apr 2008 03:39:18 +0200
Subject: [PATCH 34/36] brought proc layer introductory pages up-to-date

---
 doc/devel/uml/fig128005.png | Bin 42604 -> 34040 bytes
 uml/lumiera/128005          |  15 +++++++++---
 uml/lumiera/128005.diagram  |  45 +++++++++++++++++++++++-------------
 uml/lumiera/128261          |  15 +++++++++++-
 uml/lumiera/129285          |   2 +-
 uml/lumiera/130053.diagram  |  16 ++++++-------
 uml/lumiera/5.session       |  25 ++++----------------
 uml/lumiera/lumiera.prj     |   2 +-
 wiki/draw/Proc.builder1.png | Bin 12065 -> 12692 bytes
 wiki/renderengine.html      |  40 ++++++++++++++++++--------------
 10 files changed, 92 insertions(+), 68 deletions(-)

diff --git a/doc/devel/uml/fig128005.png b/doc/devel/uml/fig128005.png
index 7290793c8a6a17876c0d310300a50540f5f28411..e9bef762483a2bf308f117a2af21c3a3df5c28f0 100644
GIT binary patch
literal 34040
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
Tk`A+gKuCzmist^N`}Ds6aYh<<

literal 42604
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

diff --git a/uml/lumiera/128005 b/uml/lumiera/128005
index b6932706b..dc0adfe5f 100644
--- a/uml/lumiera/128005
+++ b/uml/lumiera/128005
@@ -1,6 +1,6 @@
 format 40
 "design" // design
-  revision 10
+  revision 11
   modified_by 5 "hiv"
   // class settings
   //class diagram settings
@@ -54,7 +54,7 @@ Not a real code package, rather a container for design drafts, specifications, d
       end
       required_classes
 	class_ref 128261 // Fixture
-	class_ref 128005 // Session
+	class_ref 128005 // SessionImpl
       end
     end
 
@@ -65,7 +65,7 @@ Not a real code package, rather a container for design drafts, specifications, d
 	class_ref 128261 // Fixture
 	class_ref 128517 // MObject
 	class_ref 134661 // ParamProvider
-	class_ref 128005 // Session
+	class_ref 128005 // SessionImpl
       end
       component 128389 "EDL"
 	stereotype "entity"
@@ -92,6 +92,9 @@ Not a real code package, rather a container for design drafts, specifications, d
     end
 
     component 128773 "Dispatcher"
+      provided_classes
+	class_ref 141957 // ProcDispatcher
+      end
     end
 
     component 128901 "Engine"
@@ -140,6 +143,12 @@ Not a real code package, rather a container for design drafts, specifications, d
     component 130309 "AssetDB"
       stereotype "service"
     end
+
+    component 131077 "client code"
+      required_classes
+	class_ref 141957 // ProcDispatcher
+      end
+    end
   end
 
   componentview 128133 "interfaces"
diff --git a/uml/lumiera/128005.diagram b/uml/lumiera/128005.diagram
index a16e8f676..26b59ec1a 100644
--- a/uml/lumiera/128005.diagram
+++ b/uml/lumiera/128005.diagram
@@ -1,7 +1,7 @@
 format 40
 
 fragment 128005 "UI Layer"
-  xyzwh 321 22 2000 829 100
+  xyzwh 322 22 1994 828 100
 end
 fragment 128133 "Processing Layer"
   xyzwh 64 156 2000 1089 655
@@ -21,59 +21,72 @@ packagecanvas 128645
     xyzwh 94 551 2005 458 235
 componentcanvas 128773 component_ref 128005 // Builder
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 121 419 2015 229 105
+  xyzwh 122 419 2015 228 105
 componentcanvas 128901 component_ref 128133 // Session
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 122 243 2011 323 156
+  xyzwh 122 243 2011 322 155
 componentcanvas 129029 component_ref 128261 // Controller
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 372 419 2011 189 105
+  xyzwh 373 419 2011 188 105
 componentcanvas 129157 component_ref 128389 // EDL
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 288 302 2016 153 79
+  xyzwh 288 303 2016 152 78
 componentcanvas 129285 component_ref 128517 // Fixture
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 124 319 2016 153 75
+  xyzwh 125 319 2016 152 75
 note 129541 "Structures edited by the User"
   xyzwh 43 269 2016 181 41
 componentcanvas 129669 component_ref 128645 // AssetManagement
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 577 232 2010 217 201
+  xyzwh 578 233 2010 216 200
 componentcanvas 129797 component_ref 128773 // Dispatcher
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 406 31 2005 193 75
+  xyzwh 357 133 2005 192 75
 componentcanvas 129925 component_ref 128901 // Engine
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 118 602 2010 235 176
+  xyzwh 118 601 2010 235 175
 componentcanvas 130053 component_ref 129029 // Frame (Stream) Provider
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 121 876 2005 229 75
+  xyzwh 122 875 2005 228 75
 componentcanvas 130181 component_ref 129157 // Cache
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 391 876 2005 193 75
-note 131717 "Coordinates Playback and Rendering"
+  xyzwh 392 875 2005 192 75
+note 131717 "Coordinates Building and Rendering"
   xyzwh 483 494 2016 149 63
 note 131845 "border of the low-level, performance-critical part of the system"
   xyzwh 666 450 2006 167 84
 note 131973 "just works, never decides"
   xyzwh 317 668 2015 110 59
-note 132101 "codecs, stream I/O here"
-  xyzwh 376 592 2005 166 39
+note 132101 "codecs, effects, stream I/O here"
+  xyzwh 618 876 2005 200 36
 componentcanvas 132229 component_ref 130181 // MediaFactory
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 593 354 2015 158 67
+  xyzwh 593 355 2015 157 66
 componentcanvas 132357 component_ref 130309 // AssetDB
   draw_component_as_icon default show_component_req_prov default show_component_rea default
   xyzwh 629 289 2020 155 63
+componentcanvas 132485 component_ref 131077 // client code
+  draw_component_as_icon default show_component_req_prov default show_component_rea default
+  xyzwh 600 27 2005 156 63
+arrowjunctioncanvas 132997 class_ref 141957 // ProcDispatcher
+  xyz 473 83 2000 label_xy 441 100
+arrowjunctioncanvas 133253 class_ref 141957 // ProcDispatcher
+  xyz 475 71 2000 label_xy 863 37
 simplerelationcanvas 131205 simplerelation_ref 128005
   from ref 130053 z 2004 to ref 130181
 simplerelationcanvas 131333 simplerelation_ref 128133
   from ref 129925 z 2004 to ref 130053
+line 133125 ---O
+  from ref 129797 z 1999 to ref 132997
+line 133381 ---( geometry VHr
+  from ref 132485 z 1999 to point 480 56
+  line 133509 z 1999 to ref 133253
 line 130309 -_-_
   from ref 129797 z 2004 to ref 128901
 line 130821 -_-_ geometry HVr
-  from ref 129797 z 2004 to point 493 469
+  from ref 129797 z 2004 to point 450 469
   line 130949 z 2004 to ref 129029
 line 131077 -_-_
   from ref 129797 z 2004 to ref 129669
+preferred_whz 852 640 0.8
 end
diff --git a/uml/lumiera/128261 b/uml/lumiera/128261
index 6394cfca5..f016cf9c4 100644
--- a/uml/lumiera/128261
+++ b/uml/lumiera/128261
@@ -1,6 +1,6 @@
 format 40
 "MObject" // ProcessingLayer::MObject
-  revision 30
+  revision 31
   modified_by 5 "hiv"
   // class settings
   //class diagram settings
@@ -1172,6 +1172,19 @@ ${inlines}
 	  b multiplicity "" parent class_ref 139909 // LocatingPin
       end
     end
+
+    class 141957 "ProcDispatcher"
+      visibility package 
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+    end
   end
 
   package_ref 128901 // Builder
diff --git a/uml/lumiera/129285 b/uml/lumiera/129285
index 1a005d8e9..28f619bb6 100644
--- a/uml/lumiera/129285
+++ b/uml/lumiera/129285
@@ -1,6 +1,6 @@
 format 40
 "ProcessingLayer" // ProcessingLayer
-  revision 13
+  revision 14
   modified_by 5 "hiv"
   // class settings
   //class diagram settings
diff --git a/uml/lumiera/130053.diagram b/uml/lumiera/130053.diagram
index da938cd73..b8ef0a19a 100644
--- a/uml/lumiera/130053.diagram
+++ b/uml/lumiera/130053.diagram
@@ -24,7 +24,7 @@ packagecanvas 129413
    show_context_mode namespace  xyzwh 41 428 1990 385 315
 componentcanvas 129541 component_ref 128261 // Controller
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 88 546 2010 151 63
+  xyzwh 87 546 2010 151 63
 arrowjunctioncanvas 131973 class_ref 130565 // BuilderFacade
   xyz 316 456 2000 label_xy 230 507
 arrowjunctioncanvas 132229 class_ref 130565 // BuilderFacade
@@ -38,10 +38,10 @@ componentcanvas 132869 component_ref 129925 // CommonLib
 arrowjunctioncanvas 132997 class_ref 134917 // Time
   xyz 830 211 2000 label_xy 828 233
 arrowjunctioncanvas 133253 class_ref 130309 // ControllerFacade
-  xyz 480 158 2000 label_xy 448 179
+  xyz 481 157 2000 label_xy 449 178
 componentcanvas 133509 component_ref 128133 // Session
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 694 526 2005 156 63
+  xyzwh 694 526 2005 155 63
 arrowjunctioncanvas 134533 class_ref 128133 // EDL
   xyz 591 603 2000 label_xy 590 624
 arrowjunctioncanvas 134789 class_ref 128261 // Fixture
@@ -53,30 +53,30 @@ arrowjunctioncanvas 135301 class_ref 134661 // ParamProvider
 componentcanvas 135685 component_ref 128005 // Builder
   draw_component_as_icon default show_component_req_prov default show_component_rea default
   xyzwh 136 954 2005 151 63
-arrowjunctioncanvas 135813 class_ref 128005 // Session
+arrowjunctioncanvas 135813 class_ref 128005 // SessionImpl
   xyz 571 765 2000 label_xy 562 787
 arrowjunctioncanvas 136197 class_ref 132741 // StateProxy
   xyz 535 978 2000 label_xy 517 999
-arrowjunctioncanvas 136453 class_ref 128005 // Session
+arrowjunctioncanvas 136453 class_ref 128005 // SessionImpl
   xyz 526 801 2000 label_xy 517 823
 packagecanvas 136709 
   package_ref 130309 // engine
    show_context_mode namespace  xyzwh 16 1309 1994 561 265
 componentcanvas 136837 component_ref 128901 // Engine
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 103 1402 2005 156 63
+  xyzwh 103 1401 2005 156 63
 arrowjunctioncanvas 136965 class_ref 132741 // StateProxy
   xyz 535 1224 2000 label_xy 517 1245
 componentcanvas 137349 component_ref 130053 // ProcNode
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 377 1494 2000 123 63
+  xyzwh 376 1494 2000 123 63
 arrowjunctioncanvas 137477 class_ref 134533 // Parameter
   xyz 623 1379 2000 label_xy 607 1400
 arrowjunctioncanvas 137733 class_ref 134661 // ParamProvider
   xyz 684 1368 2000 label_xy 658 1389
 componentcanvas 138373 component_ref 129797 // ConManager
   draw_component_as_icon default show_component_req_prov default show_component_rea default
-  xyzwh 136 1070 2005 156 63
+  xyzwh 135 1070 2005 156 63
 arrowjunctioncanvas 138501 class_ref 134661 // ParamProvider
   xyz 586 1094 2000 label_xy 560 1115
 componentcanvas 138757 component_ref 129285 // RenderPathManager
diff --git a/uml/lumiera/5.session b/uml/lumiera/5.session
index 89c760008..fc9677d8c 100644
--- a/uml/lumiera/5.session
+++ b/uml/lumiera/5.session
@@ -1,31 +1,14 @@
 window_sizes 1140 830 270 860 680 71
 diagrams
-  classdiagram_ref 130309 // Asset Kinds
-    860 633 100 4 158 0
-  classdiagram_ref 128133 // Session structure
-    860 633 100 4 349 0
-  classdiagram_ref 128389 // Render Entities
-    743 538 100 4 184 0
-  classdiagram_ref 131205 // Struct-Asset Relations
-    555 620 100 4 60 0
-  classdiagram_ref 131461 // Rules access
-    688 627 100 4 0 0
-  componentdiagram_ref 131589 // components
-    688 544 100 4 0 0
-  active  usecasediagram_ref 131717 // when to query
-    624 495 100 4 0 0
-  collaborationdiagram_ref 131845 // "default" object
-    626 551 100 4 0 0
+  active  componentdiagram_ref 128005 // Overview
+    702 640 80 4 2 0
 end
 show_stereotypes
 selected 
   package_ref 129 // lumiera
 open
-  
-  package_ref 128005 // design
-  
-  package_ref 129285 // ProcessingLayer
-  componentview_ref 128261 // Query System overview
+  componentview_ref 128133 // interfaces
+  classview_ref 128005 // Session
   class_ref 140677 // QueryHandler
   class_ref 140805 // TypeHandler
   class_ref 140933 // ResolverBase
diff --git a/uml/lumiera/lumiera.prj b/uml/lumiera/lumiera.prj
index 8eec4bb57..dcdd63301 100644
--- a/uml/lumiera/lumiera.prj
+++ b/uml/lumiera/lumiera.prj
@@ -1,6 +1,6 @@
 format 40
 "lumiera"
-  revision 43
+  revision 44
   modified_by 5 "hiv"
   cpp_root_dir "../../src/"
 
diff --git a/wiki/draw/Proc.builder1.png b/wiki/draw/Proc.builder1.png
index 84dfa904eaa598db4d89548342ab18d5b8a4b7a5..145f98e3fce821b6adde2b46bdc23386fe4f6227 100644
GIT binary patch
literal 12692
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
La-xO8x}W|(AK-je

literal 12065
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
E4`nwziU0rr

diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index c60cbb53b..7e922bde6 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -564,8 +564,8 @@ For every Asset we generate a __Ident tuple__ and a long ID (hash) derived from
 <div title="AssetManager" modifier="Ichthyostega" created="200709200300" changecount="1">
 <pre>The Asset Manager provides an Interface to some internal Database holding all Assets in the current Session and System state. It may be a real Database at some point (and for the moment it's a Hashtable). Each [[Asset]] is registered automatically with the Asset Manager; it can be queried either by it's //identification tuple// or by it's unique ID.</pre>
 </div>
-<div title="AttachedPlacementProblem" modifier="Ichthyostega" modified="200801121214" created="200801111305" tags="impl draft dynamic" changecount="2">
-<pre>Placing an MObject relatively to another object such that it should be handled as //attached // to the latter results in several implementation problems. The typical use case is that of an effect attached to a clip or processing pipe.
+<div title="AttachedPlacementProblem" modifier="Ichthyostega" modified="200804121736" created="200801111305" tags="impl draft dynamic" changecount="3">
+<pre>Placing an MObject relatively to another object such that it should be handled as //attached&amp;nbsp;// to the latter results in several implementation problems. The typical use case is that of an effect attached to a clip or processing pipe.
 * this attachment is not a globally fixed relation, rather, it typically exists only for some limited time span (e.g. the duration of the basic clip the effect is attached to)
 * the order of attachment is important and the attached placement may create a fork in the signal flow, so we need a way for specifying reproducibly how the resulting wiring should be
 * when building, we access the information in reversed direction: we have the target object and need to query for all attachements
@@ -578,7 +578,7 @@ The first step towards an solution is to isolate the problem; obviously we //nee
 [img[how to implement Automation|uml/fig129669.png]]
 </pre>
 </div>
-<div title="BasicBuildingOperations" modifier="Ichthyostega" modified="200801111146" created="200712040334" tags="design dynamic Builder" changecount="22">
+<div title="BasicBuildingOperations" modifier="Ichthyostega" modified="200804121734" created="200712040334" tags="design dynamic Builder" changecount="23">
 <pre>Starting out from the concepts of Objects, Placement to Tracks, render Pipes and connection properties (&amp;rarr; see [[here|TrackPipeEDL]]) within the EDL, we can identify the elementary operations occuring within the Builder. Overall, the Builder is organized as application of //visiting tools// to a collection of objects, so finally we have to consider some object kind appearing in the working function of the given builder tool, which holds at this moment some //context//. The job now is to organize this context such as to create a predictable build process from this //event driven// approach.
 
 !Builder working Situations
@@ -589,7 +589,7 @@ The first step towards an solution is to isolate the problem; obviously we //nee
 ##* effectively this is an application of effects
 ## at this point we have to process (and maybe generate on-the-fly) the [[source port of this clip|ClipSourcePort]]
 ##* the output of the source reading and preprocessing defined thus far is delivered as input to this port, which is done by a ~WiringRequest (see below)
-##* as every port, it is the entry point to a [[processing pipe|Pipe], thus the source port has a processing pattern, typically inserting the camera (transformation effect) at this point
+##* as every port, it is the entry point to a [[processing pipe|Pipe]], thus the source port has a processing pattern, typically inserting the camera (transformation effect) at this point
 ## followed by the application of effects
 ##* separately for every effect chain rooted (placed) directly onto the clip
 ##* and regarding the chaining order
@@ -1734,8 +1734,13 @@ But because I know the opinions on this topc are varying (users tend to be delig
 My proposed aproach is to treat OpenGL as a separate video raw data type, requiring separete and specialized [[Processing Nodes|ProcNode]] for all calculations. Thus the Builder could connect OpenGL nodes if it is possible to cover the whole render path for preview and fall back to the normal ~ProcNodes for all relevant renders
 </pre>
 </div>
-<div title="Overview" modifier="Ichthyostega" modified="200711122342" created="200706190300" tags="overview" changecount="6">
+<div title="Overview" modifier="Ichthyostega" modified="200804130018" created="200706190300" tags="overview" changecount="12">
 <pre>The Lumiera Processing Layer is comprised of various subsystems and can be separated into a low-level and a high-level part. At the low-level end is the [[Render Engine|OverviewRenderEngine]] which basically is a network of render nodes cooperating closely with the Backend Layer in order to carry out the actual playback and media transforming calculations. Whereas on the high-level side we find several different [[Media Objects|MObjects]] that can be placed into the [[EDL]], edited and manipulated. This is complemented by the [[Asset Management|Asset]], which is the &quot;bookkeeping view&quot; of all the different &quot;things&quot; within each [[Session|SessionOverview]].
+
+There is rather strong separation between these two levels, and &amp;mdash; &lt;br/&gt;correspondingly you'll encounter the data held within the Processing Layer organized in two different views, the ''high-level-model'' and the ''low-level-model''
+* from users (and GUI) perspective, you'll see a [[Session|SessionOverview]] with a timeline-like structure, where various [[Media Objects|MObjects]] are arranged and [[placed|Placement]]. By looking closer, you'll find that there are data connections and all processing is organized around processing chains or [[pipes|Pipe]], which can be either global (in the Session) or local (in real or [[virtual|VirtualClip]] clips)
+* when dealing with the actual calculations in the Engine (&amp;rarr; see OverviewRenderEngine), you won't find any Tracks, Media Objects or Pipes &amp;mdash; rather you'll find a network of interconnected [[render nodes|ProcNode]] forming the low level model. Each structurally constant segment of the timeline corresponds to a separate node network providing an ExitNode corresponding to each of the global pipes; pulling frames from them means running the engine.
+* it is the job of the [[Builder]] create and wire up this render nodes network when provided with a given hig-level-model. So, actually the builder (together with the so called [[Fixture]]) form an isolation layer in the middle, separating the //editing part&amp;nbsp;// from the //processing part.//
 [img[Block Diagram|uml/fig128005.png]]
 </pre>
 </div>
@@ -2508,7 +2513,7 @@ Besides, they provide an important __inward interface__ for the [[ProcNode]]s, w
 
 </pre>
 </div>
-<div title="ProcLayer and Engine" modifier="Ichthyostega" modified="200804070258" created="200706190056" tags="overview" changecount="7">
+<div title="ProcLayer and Engine" modifier="Ichthyostega" modified="200804122354" created="200706190056" tags="overview" changecount="9">
 <pre>The Render Engine is the part of the application doing the actual video calculations. Its operations are guided by the Objects and Parameters edited by the user in [[the EDL|EDL]] and it retrieves the raw audio and video data from the [[Data backend|backend.html]]. Because the inner workings of the Render Engine are closely related to the structures used in the EDL, this design covers [[the aspect of objects placed into the EDL|MObjects]] as well.
 &lt;&lt;&lt;
 ''Status'': started out as design draft in summer '07, Ichthyo is now in the middle of a implementing the foundations and main structures in C++
@@ -2526,8 +2531,9 @@ The system is ''open'' inasmuch every part mirrors the structure of correspondin
 
 !!see also
 &amp;rarr; [[Overview]] of Subsystems and Components, and DesignGoals
-&amp;rarr; [[An Introduction|WalkThrough]] discussing the key features
-&amp;rarr; [[Overview Render Engine|OverviewRenderEngine]]
+&amp;rarr; [[An Introduction|WalkThrough]] discussing the central points of this design
+&amp;rarr; [[Overview Session (high level model)|SessionOverview]]
+&amp;rarr; [[Overview Render Engine (low level model)|OverviewRenderEngine]]
 &amp;rarr; BuildProcess and RenderProcess
 &amp;rarr; [[Two Examples|Examples]] (Object diagrams) 
 &amp;rarr; how [[Automation]] works
@@ -2835,7 +2841,7 @@ The Session object is a singleton &amp;mdash; actually it is a »~PImpl«-Facade
 * a collection of ''global Pipes''
 * the ''Fixture'' with a possibility to [[(re)build it|PlanningBuildFixture]]</pre>
 </div>
-<div title="SessionOverview" modifier="Ichthyostega" modified="200801061947" created="200709272105" tags="design" changecount="15">
+<div title="SessionOverview" modifier="Ichthyostega" modified="200804122351" created="200709272105" tags="design" changecount="21">
 <pre>The [[Session]] (sometimes also called //Project//) contains all informations and objects to be edited by the User. It can be saved and loaded. The individual Objects within the Session, i.e. Clips, Media, Effects, are contained in one (or several) collections within the Session, which we call [[EDL (Edit Decision List)|EDL]]. Moreover, the sesion contains references to all the Media files used, and it contains various default or user defined configuration, all being represented as [[Asset]]. At any given time, there is //only one current session// opened within the application.
 
 !!!larger projects
@@ -2845,14 +2851,14 @@ For larger editing projects the simple structure of a session containing &quot;t
 With all the structural complexities possible within such a session, we need an isolation layer to provide __one__ definitive state where all configuration has been made explicit. Thus the session manages one special object list, the [[Fixture]], which can be seen as all currently active objects placed onto a single timeline.
 
 !!!organisational devices
-The possibility of having multiple ~EDLs helps organizing larger projects. Each [[EDL]] is just a logical grouping; because all effective properties of any MObject within this EDL are defined by the ~MObject itself and the [[Placement]], by which the object is anchored to some time point, some track, can be connected to some pipe, or linked to another object. In a similar manner, Tracks are just another organisational aid for grouping objects, disabling them and defining common output pipes.
+The possibility of having multiple ~EDLs helps organizing larger projects. Each [[EDL]] is just a logical grouping; because all effective properties of any MObject within this EDL are defined by the ~MObject itself and the [[Placement]], by which the object is anchored to some time point, some track, can be connected to some pipe, or linked to another object. In a similar manner, [[Tracks|Track]] are just another organisational aid for grouping objects, disabling them and defining common output pipes.
 
 !!!global pipes
-Any session should contain a number of global [[(destination) pipes|Pipe]], typically video out and audio out. The goal is, to get any content producing or transforming object in some way connected to one of these outputs, either //by [[placing|Placement]] it directly// to some pipe, or by //placing it to a track// and having the track refer to some pipe. Besides the global destination pipes, we can use internal pipes to form busses or subgroups, either on a global (session) level, or by using the processing pipe within a [[virtual clip|VirtualClip]], which can be placed freely within the ~EDLs. Normally, pipes just gather and mix data, but of course any pipe can have an attached effect chain. (&amp;rarr; see [[more on Tracks and Pipes within the EDL|TrackPipeEDL]])
+[&gt;img[draw/Proc.builder1.png]] Any session should contain a number of global [[(destination) pipes|Pipe]], typically video out and audio out. The goal is, to get any content producing or transforming object in some way connected to one of these outputs, either //by [[placing|Placement]] it directly// to some pipe, or by //placing it to a track// and having the track refer to some pipe. Besides the global destination pipes, we can use internal pipes to form busses or subgroups, either on a global (session) level, or by using the processing pipe within a [[virtual clip|VirtualClip]], which can be placed freely within the EDL(s). Normally, pipes just gather and mix data, but of course any pipe can have an attached effect chain. (&amp;rarr; see [[more on Tracks and Pipes within the EDL|TrackPipeEDL]])
 
 !!!default configuration
-[&gt;img[draw/Proc.builder1.png]]While all these possibilities may seem daunting, there is a simple default configuration loaded into any pristine new session:
-It will contain a global video and audio out pipe, just one EDL with one track; this track will have a internal video and audio pipe (bus) configured with one fading device sending to the global output ports. So, by adding some clip with a simple absolute placement to this track and some time position, the clip gets connected and rendered, after [[(re)building|PlanningBuildFixture]] the [[Fixture]] and passing the result to the [[Builder]] &amp;mdash; and using the resulting render nodes network (Render Engine).
+While all these possibilities may seem daunting, there is a simple default configuration loaded into any pristine new session:
+It will contain a global video and audio out pipe, just one EDL with a single track; this track will have a internal video and audio pipe (bus) configured with one fading device sending to the global output ports. So, by adding some clip with a simple absolute placement to this track and some time position, the clip gets connected and rendered, after [[(re)building|PlanningBuildFixture]] the [[Fixture]] and passing the result to the [[Builder]] &amp;mdash; and using the resulting render nodes network (Render Engine).
 </pre>
 </div>
 <div title="SideBarOptions" modifier="CehTeh" created="200706200048" changecount="1">
@@ -4265,7 +4271,7 @@ generally speaking, visitors are preferable when the underlying element type hie
 To see an simple example of our &quot;visiting tool&quot;, have a look at {{{tests/components/common/visitingtooltest.cpp}}}
 </pre>
 </div>
-<div title="WalkThrough" modifier="Ichthyostega" modified="200711122353" created="200706210625" tags="overview" changecount="35">
+<div title="WalkThrough" modifier="Ichthyostega" modified="200804130047" created="200706210625" tags="overview" changecount="39">
 <pre>The Intention of this text is to help you understanding the design and to show some notable details.
 
 !!!!Starting Point
@@ -4282,15 +4288,15 @@ Design is an experiment to find out how things are related. We can't //plan// a
 !!!!Concepts and Interfaces
 This design strives to build each level and subsystem around some central concepts, which are directly expressed as Interfaces. Commonly used Interfaces clamp the different layers.
 * MObject gives an uniform view on all the various entities to be arranged in the EDL.
-* all the arranging and relating of ~MObjects is abstracted as [[Placement]]. The contract of a Placement is that it always has a related Subject, that we can call some test methods on it (still to be defined), and, finally, that we can get an ExplicitPlacement from it.
-* albeit being a special form of a Placement, the ExplicitPlacement is treated as a separate concept. With respect to edit operations within the EDL, it can stand for any sort of Placement. On the other hand the Builder takes a list of ~ExplicitPlacements as input for building up the Render Engine(s). This corresponds to the fact that the render process needs to organize the things to be done on a simple two dimensional grid of (output channel / time). The (extended) contract of an ~ExplicitPlacement provides us with this information (track,time).
+* all the arranging and relating of ~MObjects is abstracted as [[Placement]]. The contract of a Placement is that it always has a related Subject, that we can change the //way of placement&amp;nbsp;// by adding and removing [[&quot;locating pins&quot;|LocatingPin]], call some test methods on it (still to be defined), and, finally, that we can get an ExplicitPlacement from it.
+* albeit being a special form of a Placement, the ExplicitPlacement is treated as a separate concept. With respect to edit operations within the EDL, it can stand for any sort of Placement. On the other hand the Builder takes a list of ~ExplicitPlacements as input for building up the Render Engine(s). This corresponds to the fact that the render process needs to organize the things to be done on a simple two dimensional grid of (output channel / time). The (extended) contract of an ~ExplicitPlacement provides us with this (output,time).
 * on the lower end of the builder, everything is organized around the Concept of a ProcNode, which enables us to //pull// one (freely addressable) Frame of calculated data. Further, the ProcNode has the ability to be wired with other nodes and [[Parameter Providers|ParamProvider]]
 * the various types of data to be processed are abstracted away under the notion of a [[Frame]]. Basically, a Frame is an Buffer containing an Array of raw data and it can be located by some generic scheme, including (at least) the absolute starting time (and probably some type or channel id).
 * All sorts of (target domain) [[Parameters]] are treated uniformly. There is a distinction between Parameters (which //could// be variable) and Configuration (which is considered to be fixed). In this context, Automation just appears as a special kind of ParamProvider.
 * and finally, the calculation //process// together with its current state is represented by a StateProxy. I call this a &quot;proxy&quot;, because it should encapsulate and hide all tedious details of communication, be it even asynchronous communication with some Controller or Dispatcher running in another Thread. In order to maintain a view on the current state of the render process, it could eventually be necessary to register as an observer somewhere or to send notifications to other parts of the system.
 
 !!!!Handling Diversity
-An important goal of this approach is to be able to push down the treatment of variations and special cases. We don't need to know what kind of Placement links one MObject to another, because it is sufficient for us to get an ExplicitPlacement. The Render Engine doesn't need to know if it is pulling audio Frames or video Frames or GOPs or OpenGL textures. It simply relies on the Builder wiring together the correct node types. And the Builder in turn does so by using some overloaded function of an iterator or visitor. There is no need for the video [[ProcNodes|ProcNode]] to test for the colormodel on every screen line, because the Data Frame can be a Template parametrized by the colormodel. All of this reduces complexity and quite some misconceptions can be detected already by the compiler.
+An important goal of this approach is to be able to push down the treatment of variations and special cases. We don't need to know what kind of Placement links one MObject to another, because it is sufficient for us to get an ExplicitPlacement. The Render Engine doesn't need to know if it is pulling audio Frames or video Frames or GOPs or OpenGL textures. It simply relies on the Builder wiring together the correct node types. And the Builder in turn does so by using some overloaded function of an iterator or visitor. At many instances, instead of doing decisions in-code or using hard wired defaults, a system of [[configuration rules|ConfigRules]] is invoked to get a suitable default as a solution (and, as a plus, this provides points of customisation for advanced users). At engine level, there is no need for the video processing node to test for the colormodel on every screen line, because the Builder has already wired up the fitting implementation routine. All of this helps reducing complexity and quite some misconceptions can be detected already by the compiler.
 
 !!!!Explicit structural differences
 In case it's not already clear: we don't have &quot;the&quot; Render Engine, rather we construct a Render Engine for each structurally differing part of the timeline. (please relate this to the current Cinelerra code base, which constructs and builds up the render pipeline for each frame separately). No need to call back from within the pipeline to find out if a given plugin is enabled or to see if there are any automation keyframes. We don't need to pose any constraints on the structuring of the objects in the EDL, besides the requirement to get an ExplicitPlacement for each. We could even loosen the use of the common metaphor of placing media sequences on fixed tracks, if we want to get at a more advanced GUI at some point in the future.

From 85189d3f4c384758f95e137d744abefbbc44ce7a Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 13 Apr 2008 23:54:39 +0200
Subject: [PATCH 35/36] extend Appconfig class to provide Lifecycle callback
 hooks esp. for automatic triggering the initialisation of very basic struff
 (like NoBug...)

---
 doc/devel/uml/class141957.html   |  20 ++++++
 src/common/appconfig.cpp         |  81 +++++++++++++++++++++----
 src/common/appconfig.hpp         |  88 +++++++++++++++++++++------
 src/common/lifecycleregistry.hpp | 101 +++++++++++++++++++++++++++++++
 src/proc/asset.hpp               |   2 +-
 src/proc/mobject/session.hpp     |   2 +-
 tests/50components.tests         |   5 ++
 tests/common/appconfigtest.cpp   |   5 +-
 tests/common/lifecycletest.cpp   |  78 ++++++++++++++++++++++++
 9 files changed, 347 insertions(+), 35 deletions(-)
 create mode 100644 doc/devel/uml/class141957.html
 create mode 100644 src/common/lifecycleregistry.hpp
 create mode 100644 tests/common/lifecycletest.cpp

diff --git a/doc/devel/uml/class141957.html b/doc/devel/uml/class141957.html
new file mode 100644
index 000000000..9158a22a5
--- /dev/null
+++ b/doc/devel/uml/class141957.html
@@ -0,0 +1,20 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class ProcDispatcher</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class ProcDispatcher</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass141957"></a>
+<p>Declaration :</p><ul><li>C++ : class ProcDispatcher </li></ul><p>Component(s) : <a href="index.html#refcomponent128773"><b>Dispatcher</b></a></p></body>
+</html>
diff --git a/src/common/appconfig.cpp b/src/common/appconfig.cpp
index 17a245cdf..b708d42d0 100644
--- a/src/common/appconfig.cpp
+++ b/src/common/appconfig.cpp
@@ -33,29 +33,37 @@
 
 
 using util::isnil;
+using util::cStr;
 
 namespace lumiera
   {
   
 
 #ifndef LUMIERA_VERSION
-#define LUMIERA_VERSION 3++devel
+#define LUMIERA_VERSION 0++devel
 #endif
 
 
-  /** perform initialization on first access. 
-   *  A call is placed in static initialization code
-   *  included in lumiera.h; thus it will happen
-   *  probably very early.
+  /** perform initialization triggered on first access. 
+   *  Will execute the ON_BASIC_INIT hook, but under typical
+   *  circumstances this is a NOP, because when callbacks are
+   *  added to this hook, the Appconfig singleton instance has
+   *  already been created. For this reason, there is special
+   *  treatment for the ON_BASIC_INIT in LifecycleHook::add,
+   *  causing the provided callbacks being fired immediately.
+   *  (btw, this is nothing to be worried of, for the client
+   *  code it just behaves like intended). 
    */
   Appconfig::Appconfig()
-    : configParam_ (new Configmap)
+    : configParam_  (new Configmap),
+      lifecycleHooks_(new LifecycleRegistry)
   {
     ////////// 
     NOBUG_INIT;
     //////////
     
     INFO(config, "Basic application configuration triggered.");
+    lifecycleHooks_->execute (ON_BASIC_INIT);   // note in most cases a NOP
     
     // install our own handler for undeclared exceptions
     std::set_unexpected (lumiera::error::lumiera_unexpectedException);
@@ -67,11 +75,8 @@ namespace lumiera
   
   
   
-  /** access the configuation value for a given key.
-   *  @return empty string for unknown keys, else the corresponding configuration value
-   */
   const string &
-  Appconfig::get (const string & key)  throw()
+  Appconfig::get (const string & key)
   {
     try
       {
@@ -82,10 +87,64 @@ namespace lumiera
     catch (...)
       {
         ERROR(config, "error while accessing configuration parameter \"%s\".", key.c_str());
-        throw lumiera::error::Fatal ();
+        static string NOTFOUND ("");
+        return NOTFOUND;
   }   }
 
   
+  void
+  Appconfig::lifecycle (Symbol event_label)
+  {
+    instance().lifecycleHooks_->execute(event_label);
+  }
 
 
+
+  
+  // ==== implementation LifecycleHook class =======
+  
+  typedef LifecycleRegistry::Hook Callback;
+  
+  
+  LifecycleHook::LifecycleHook (Symbol eventLabel, Callback callbackFun)
+  {
+    this->add (eventLabel,callbackFun);
+  }
+  
+  LifecycleHook&
+  LifecycleHook::add (Symbol eventLabel, Callback callbackFun)
+  {
+    Appconfig::instance().lifecycleHooks_->enroll (eventLabel,callbackFun);
+    
+    if (!strcmp(ON_BASIC_INIT, eventLabel))
+      callbackFun();  // when this code executes,
+                     //  then per definition we are already post "basic init"
+                    //   (which happens in the Appconfig ctor); thus fire it immediately
+    return *this;
+  }
+  
+  
+  
 } // namespace lumiera
+
+// ==== implementation C interface =======
+
+void 
+lumiera_LifecycleHook_add (const char* eventLabel, void callbackFun(void))
+{
+  lumiera::LifecycleHook (eventLabel, callbackFun);
+}
+
+
+void
+lumiera_Lifecycle_execute (const char* eventLabel)
+{
+  lumiera::Appconfig::lifecycle (eventLabel);
+}
+
+
+const char*
+lumiera_Appconfig_get (const char* key)
+{
+  return cStr (lumiera::Appconfig::get(key));
+}
diff --git a/src/common/appconfig.hpp b/src/common/appconfig.hpp
index 984236755..92180fe60 100644
--- a/src/common/appconfig.hpp
+++ b/src/common/appconfig.hpp
@@ -22,15 +22,18 @@
 */
 
 /** @file appconfig.hpp
- ** This header is special, as it causes global system initialisation
- ** to happen. On inclusion, it places static initialisation code,
- ** which on first run will create the Appconfig singleton instance.
- ** Additionally, the inclusion, configuration and initialisation
- ** of the NoBug library is handled here. Global <i>definitions</i>
- ** for NoBug are placed into the corresponding translation unit 
- ** appconfig.cpp"
+ ** Registering and managing some application-global services.
+ ** Besides \link Appconfig::get querying \endlink for some 
+ ** "Application property" constants, there is a mechanism for
+ ** registering and firing off application lifecycle event hooks.
+ ** The implementation of some subsystem can define a static instance
+ ** variable of class LifecycleHook, which will place the provided
+ ** callback function into a central registry accessable through
+ ** the Appconfig singleton instance.
  **
- ** @see nobugcfg.h
+ ** @see lumiera.cpp
+ ** @see nobugcfg.cpp
+ ** @see sessmanagerimpl.cpp
  */
 
 
@@ -40,6 +43,8 @@
 #include <map>
 #include <string>
 #include <boost/scoped_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include "common/lifecycleregistry.hpp"
 
 #include "nobugcfg.h"
 
@@ -49,6 +54,7 @@ namespace lumiera
   {
   using std::string;
   using boost::scoped_ptr;
+  using boost::noncopyable;
 
 
   /**
@@ -59,14 +65,14 @@ namespace lumiera
    * @warning don't use Appconfig in destuctors.
    */
   class Appconfig
+    : private noncopyable
     {
     private:
       /** perform initialization on first access.
-       *  @see #instance()  for Lifecycle     */
+       *  @see #instance()              */
       Appconfig ();
       
-      Appconfig (const Appconfig&); ///< copy prohibited, not implemented
-      ~Appconfig ()  throw()   {}; ///< deletion prohibited
+      ~Appconfig ()  throw()   {};  ///< deletion prohibited
       friend void boost::checked_delete<Appconfig>(Appconfig*);
 
       
@@ -85,24 +91,70 @@ namespace lumiera
       
       /** access the configuation value for a given key.
        *  @return empty string for unknown keys, config value else
-       *  @todo do we need such a facility?
        */
-      static const string & get (const string& key)  throw();
+      static const string & get (const string& key);  // never throws
       
+      /** fire off all lifecycle callbacks
+       *  registered under the given label */
+      static void lifecycle (Symbol eventLabel);
+      
+      // note: if necessary, we can add support 
+      // for querying the current lifecycle phase...
       
     private:
       typedef std::map<string,string> Configmap; 
-      typedef std::auto_ptr<Configmap> PConfig;
+      typedef scoped_ptr<Configmap> PConfig;
+      typedef scoped_ptr<LifecycleRegistry> PLife;
       
-      /** @todo <b>the following is just placeholder code!</b>
-       *  Appconfig <i>could</i> do such things if necessary,
-       *  or provide similar "allways available" services.
-       */
       PConfig configParam_;
+      PLife lifecycleHooks_;
       
+      friend class LifecycleHook;
+      
+    };
+    
+  
+  Symbol ON_BASIC_INIT      ("ON_BASIC_INIT");         ///< automatic static init. treated specially
+  Symbol ON_GLOBAL_INIT     ("ON_GLOBAL_INIT");        ///< to be triggered in main()             @note no magic!
+  Symbol ON_GLOBAL_SHUTDOWN ("ON_GLOBAL_SHUTDOWN");    ///< to be triggered at the end of main()  @note no magic!
+  
+  // client code is free to register and use additional lifecycle events
+  
+  
+  /**
+   *  define and register a callback for some lifecycle event.
+   *  The purpose of this class is to be defined as a static variable
+   *  in the implementation of some subsystem (i.e. in the cpp file),
+   *  providing the ctor with the pointer to a callback function.
+   *  Thus the callback gets enrolled when the corresponding object
+   *  file is loaded. The event ON_BASIC_INIT is handled specifically,
+   *  firing off the referred callback function as soon as possible.
+   *  All other lables are just arbitrary (string) constants and it
+   *  is necessary that "someone" cares to fire off the lifcycle events
+   *  at the right place. For example, lumiera-main (and the test runner)
+   *  calls \c Appconfig::instance().execute(ON_GLOBAL_INIT) (and..SHUTDOWN) 
+   */
+  class LifecycleHook
+    : private noncopyable
+    {
+    public:
+      LifecycleHook (Symbol eventLabel, LifecycleRegistry::Hook callbackFun);
+      
+      LifecycleHook& add (Symbol eventLabel, LifecycleRegistry::Hook callbackFun); ///< for chained calls (add multiple callbacks)
     };
 
 
 
 } // namespace lumiera
+
+
+extern "C" {  //TODO provide a separate header if some C code happens to need this...
+
+  void lumiera_LifecycleHook_add (const char* eventLabel, void callbackFun(void));
+  void lumiera_Lifecycle_execute (const char* eventLabel);
+  const char* lumiera_Appconfig_get (const char* key);
+  
+}
+
+
 #endif
diff --git a/src/common/lifecycleregistry.hpp b/src/common/lifecycleregistry.hpp
new file mode 100644
index 000000000..8b17a33b6
--- /dev/null
+++ b/src/common/lifecycleregistry.hpp
@@ -0,0 +1,101 @@
+/*
+  LIFECYCLEREGISTRY.hpp  -  registry for application lifecycle callbacks 
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
+                        Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+*/
+
+/** @file lifecycleregistry.hpp
+ ** Helper for registering lifecycle event callbacks, which are
+ ** provided as a global service by lumiera::Appconfig. This service
+ ** allows to enroll functions under a given label and then to call
+ ** all those registered functions. 
+ ** @note this is in fact an event mechanism, and if we start using
+ ** more than just this basic functionallity, we should switch to
+ ** boost::signals. (which has the downside of being an binary
+ ** dependency).
+ **
+ ** @see appconfig.hpp
+ */
+
+
+#ifndef LUMIERA_LIFECYCLE_H
+#define LUMIERA_LIFECYCLE_H
+
+#include <map>
+#include <vector>
+//#include <string>
+//#include <boost/scoped_ptr.hpp>
+#include <boost/function.hpp>
+#include <boost/noncopyable.hpp>
+
+
+
+namespace lumiera
+  {
+//  using std::string;
+//  using boost::scoped_ptr;
+  using boost::noncopyable;
+  using boost::function;
+
+  typedef const char * const Symbol;  
+
+  
+  /**
+   * Registry of callback functions accessable by a label (ID)
+   * provided at registration. Registered functions will be added
+   * to a list, which can be triggered via label. Used by Appconfig
+   * to implement the lumiera lifecycle (init, shutdown) hooks.
+   */
+  class LifecycleRegistry
+    : private noncopyable
+    {
+    public:
+      typedef boost::function<void(void)> Hook;
+      typedef std::vector<Hook> Callbacks;
+      typedef Callbacks::iterator Iter;
+      
+      
+      void enroll (Symbol label, Hook& toCall)
+        {
+          table_[label].push_back(toCall);
+        }
+      
+      void execute (Symbol label)
+        {
+          Callbacks& cbs (table_[label]);
+          Iter e = cbs.end();
+          for (Iter p = cbs.begin(); 
+               p != e; ++p) 
+            (*p)(); // invoke callback
+        }
+      
+      
+    private:
+      std::map<Symbol, Callbacks> table_;
+      
+      LifecycleRegistry ()  {}
+      friend class Appconfig;
+      
+    };
+
+
+
+} // namespace lumiera
+#endif
diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp
index ec1c64ef9..2ed5141c8 100644
--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@@ -61,7 +61,7 @@
 
 #include <boost/type_traits/is_base_of.hpp>
 #include <boost/operators.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <cstddef>
 #include <string>
diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp
index 7b9dfd4ef..d91e5f32a 100644
--- a/src/proc/mobject/session.hpp
+++ b/src/proc/mobject/session.hpp
@@ -37,7 +37,7 @@
 #include "proc/mobject/session/defsmanager.hpp"
 #include "common/singleton.hpp"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <tr1/memory>
 
 
diff --git a/tests/50components.tests b/tests/50components.tests
index 63e97cf9a..2bac409cb 100644
--- a/tests/50components.tests
+++ b/tests/50components.tests
@@ -107,6 +107,11 @@ out: dtor ~TargetObj(12) successfull
 END
 
 
+TEST "LifeCycle_test" LifeCycle_test  <<END
+return: 0
+END
+
+
 TEST "RemoveFromSet_test" RemoveFromSet_test <<END
 out: removed  nothing  ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ]
 out: removed 0 ---> [ 1, 2, 3, 4, 5, 6, 7, 8, 9, ]
diff --git a/tests/common/appconfigtest.cpp b/tests/common/appconfigtest.cpp
index 6cab57de8..215c8c46c 100644
--- a/tests/common/appconfigtest.cpp
+++ b/tests/common/appconfigtest.cpp
@@ -1,5 +1,5 @@
 /*
-  Appconfig(Test)  -  accessing the allwasy-available Appconfig singleton
+  Appconfig(Test)  -  accessing the allways-available Appconfig singleton
  
   Copyright (C)         Lumiera.org
     2008,               Hermann Vosseler <Ichthyostega@web.de>
@@ -28,9 +28,6 @@
 #include "common/util.hpp"
 
 
-#include <iostream>
-using std::cout;
-
 
 
 namespace lumiera
diff --git a/tests/common/lifecycletest.cpp b/tests/common/lifecycletest.cpp
new file mode 100644
index 000000000..5e5a779a1
--- /dev/null
+++ b/tests/common/lifecycletest.cpp
@@ -0,0 +1,78 @@
+/*
+  LifeCycle(Test)  -  checking the lifecycle callback hooks provided by Appconfig
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+
+#include "common/appconfig.hpp"
+
+#include "common/test/run.hpp"
+#include "common/util.hpp"
+
+
+
+
+namespace lumiera
+  {
+  namespace test
+    {
+    
+    bool basicInit (false);
+    bool customCallback (false);
+    
+    void basicInitHook () { basicInit = true; }
+    void myCallback() { customCallback = true; }
+
+    Symbol MY_MAGIC_MEGA_EVENT = "dial M for murder";
+    
+    
+    namespace // register them to be invoced by lifecycle event id 
+      {
+      LifecycleHook _schedule1 (ON_BASIC_INIT, &basicInitHook);         
+      LifecycleHook _schedule2 (MY_MAGIC_MEGA_EVENT, &myCallback);   
+    }
+    
+    
+    /** @test the global lifecycle hooks got registered,
+     *        the ON_BASIC_INIT hook has been already called,
+     *        while our custom callback can be trigged at our will
+     */
+    class LifeCycle_test : public Test
+      {
+        virtual void 
+        run (Arg arg)
+          {
+            ASSERT (basicInit, "the basic-init callback hasn't been invoked automatically");
+            
+            ASSERT (!customCallback);
+            Appconfig::lifecycle (MY_MAGIC_MEGA_EVENT);
+            ASSERT ( customCallback);
+          }
+        
+      };
+    
+      LAUNCHER (LifeCycle_test, "function common");
+
+      
+  } // namespace test
+    
+} // namespace util
+

From 3e8996005e6b9525e7ee8642607927e89d740d7f Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 14 Apr 2008 05:15:16 +0200
Subject: [PATCH 36/36] start using the new lifecycle hooks. remove global
 nobugcfg.h Now using proc/lumiera.hpp and proc/nobugcfg.hpp (i.e. only for
 the proc-Layer). Using ON_BASIC_INIT to pull up NoBug automatically and for
 installing the unknown-exception handler. Add calls for ON_GLOBAL_INIT and
 ON_GLOBAL_SHUTDOWN hooks to main() and to the testrunner

---
 src/common/cmdline.cpp                    |  2 +-
 src/common/configrules.cpp                |  2 +-
 src/common/error.cpp                      |  5 +++
 src/common/error.hpp                      | 10 ++++-
 src/common/multithread.hpp                |  2 +-
 src/common/query.cpp                      |  2 +-
 src/common/query/mockconfigrules.cpp      |  2 +-
 src/common/singletonfactory.hpp           |  2 +-
 src/common/test/run.hpp                   |  2 +-
 src/common/test/suite.cpp                 |  2 +-
 src/common/test/testoption.cpp            |  1 -
 src/{common => lib}/appconfig.cpp         | 36 +++++++-----------
 src/{common => lib}/appconfig.hpp         | 23 +++++-------
 src/{common => lib}/lifecycleregistry.hpp | 27 ++++++++------
 src/main.cpp                              | 12 +++++-
 src/pre.hpp                               |  2 +-
 src/pre_a.hpp                             |  2 +-
 src/proc/asset/category.cpp               |  2 +-
 src/proc/asset/media.cpp                  |  2 +-
 src/proc/asset/meta.cpp                   |  2 +-
 src/proc/asset/proc.cpp                   |  2 +-
 src/proc/asset/struct.cpp                 |  2 +-
 src/proc/engine/processor.hpp             |  2 +-
 src/{lumiera.h => proc/lumiera.hpp}       | 26 ++-----------
 src/proc/mobject/mobject.hpp              |  2 +-
 src/proc/mobject/session/fixture.cpp      |  2 +-
 src/proc/mobject/session/locatingpin.hpp  |  2 +-
 src/proc/mobject/session/segment.hpp      |  2 +-
 src/proc/nobugcfg.cpp                     | 45 +++++++++++++++++++++++
 src/{nobugcfg.h => proc/nobugcfg.hpp}     | 44 ++++++++++------------
 tests/common/appconfigtest.cpp            |  4 +-
 tests/common/exceptionerrortest.cpp       |  9 ++---
 tests/common/lifecycletest.cpp            | 15 ++++----
 tests/common/mainsuite.cpp                |  9 +++++
 34 files changed, 171 insertions(+), 135 deletions(-)
 rename src/{common => lib}/appconfig.cpp (76%)
 rename src/{common => lib}/appconfig.hpp (87%)
 rename src/{common => lib}/lifecycleregistry.hpp (78%)
 rename src/{lumiera.h => proc/lumiera.hpp} (68%)
 create mode 100644 src/proc/nobugcfg.cpp
 rename src/{nobugcfg.h => proc/nobugcfg.hpp} (74%)

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index bf00cf2b2..1e8e1849f 100644
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -24,7 +24,7 @@
 
 #include "common/cmdline.hpp"
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 #include <boost/regex.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/src/common/configrules.cpp b/src/common/configrules.cpp
index 3a1ae1bdd..02a0bfcb6 100644
--- a/src/common/configrules.cpp
+++ b/src/common/configrules.cpp
@@ -24,7 +24,7 @@
 #include "common/configrules.hpp"
 #include "common/query/mockconfigrules.hpp"
 //#include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 
 
diff --git a/src/common/error.cpp b/src/common/error.cpp
index e708c5d3a..d27e60904 100644
--- a/src/common/error.cpp
+++ b/src/common/error.cpp
@@ -189,6 +189,11 @@ namespace lumiera
     }
     
     
+    void install_unexpectedException_handler ()
+    {
+      std::set_unexpected (lumiera_unexpectedException);      
+    }
+    
   } // namespace error
   
 } // namespace lumiera
diff --git a/src/common/error.hpp b/src/common/error.hpp
index 71e5f79dc..687425ec2 100644
--- a/src/common/error.hpp
+++ b/src/common/error.hpp
@@ -25,7 +25,7 @@
 #define LUMIERA_ERROR_HPP_
 
 #include <string>
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 #include "lib/error.h"
 
 
@@ -150,6 +150,14 @@ namespace lumiera
     LUMIERA_EXCEPTION_DECLARE (External, Error,  LUMIERA_ERROR_EXTERNAL);
     
     
+    /** install our own handler for undeclared exceptions. Will be
+     *  called automatically ON_BASIC_INIT when including errror.hpp
+     *  @see appconfig.hpp  */
+    void install_unexpectedException_handler ();
+    namespace {
+      LifecycleHook schedule_ (ON_BASIC_INIT, &install_unexpectedException_handler);         
+    }
+    
   } // namespace error
 
 } // namespace lumiera
diff --git a/src/common/multithread.hpp b/src/common/multithread.hpp
index 0e936964c..8cdbe8002 100644
--- a/src/common/multithread.hpp
+++ b/src/common/multithread.hpp
@@ -26,7 +26,7 @@
 #ifndef LUMIERA_MULTITHREAD_H
 #define LUMIERA_MULTITHREAD_H
 
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 #include "common/util.hpp"
 
 
diff --git a/src/common/query.cpp b/src/common/query.cpp
index 67873a5e8..255061476 100644
--- a/src/common/query.cpp
+++ b/src/common/query.cpp
@@ -23,7 +23,7 @@
 
 #include "common/query.hpp"
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp
index c8b9f774b..0ae7f29ed 100644
--- a/src/common/query/mockconfigrules.cpp
+++ b/src/common/query/mockconfigrules.cpp
@@ -28,8 +28,8 @@
 #include "proc/asset/pipe.hpp"
 
 
+#include "proc/nobugcfg.hpp"
 #include "common/util.hpp"
-#include "nobugcfg.h"
 
 using util::isnil;
 
diff --git a/src/common/singletonfactory.hpp b/src/common/singletonfactory.hpp
index 9fdf21d21..0065227df 100644
--- a/src/common/singletonfactory.hpp
+++ b/src/common/singletonfactory.hpp
@@ -38,7 +38,7 @@ This code is heavily inspired by
 #include "common/singletonpolicies.hpp"  ///< several Policies usable together with SingletonFactory
 
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 
 
diff --git a/src/common/test/run.hpp b/src/common/test/run.hpp
index 529896d0b..b1dbd08b6 100644
--- a/src/common/test/run.hpp
+++ b/src/common/test/run.hpp
@@ -28,7 +28,7 @@
 #include "pre.hpp"
 
 
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 #include "common/test/suite.hpp"
 #include "common/util.hpp"
diff --git a/src/common/test/suite.cpp b/src/common/test/suite.cpp
index 897a7d04f..37a303ef6 100644
--- a/src/common/test/suite.cpp
+++ b/src/common/test/suite.cpp
@@ -30,7 +30,7 @@
 #include <sstream>
 #include <boost/algorithm/string.hpp>
 
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 #include "common/cmdline.hpp"
 #include "common/test/suite.hpp"
 #include "common/test/run.hpp"
diff --git a/src/common/test/testoption.cpp b/src/common/test/testoption.cpp
index 8b1199887..c591e895d 100644
--- a/src/common/test/testoption.cpp
+++ b/src/common/test/testoption.cpp
@@ -24,7 +24,6 @@
 #include "common/test/testoption.hpp"
 #include "common/test/suite.hpp"
 
-#include "nobugcfg.h"
 #include "common/error.hpp"
 
 
diff --git a/src/common/appconfig.cpp b/src/lib/appconfig.cpp
similarity index 76%
rename from src/common/appconfig.cpp
rename to src/lib/appconfig.cpp
index b708d42d0..ad114fb56 100644
--- a/src/common/appconfig.cpp
+++ b/src/lib/appconfig.cpp
@@ -2,7 +2,7 @@
   Appconfig  -  for global initialization and configuration 
  
   Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -21,16 +21,10 @@
 * *****************************************************/
 
 
-#include "common/appconfig.hpp"
+#include "lib/appconfig.hpp"
 #include "common/error.hpp"
 #include "common/util.hpp"
 
-#define NOBUG_INIT_DEFS_
-#include "nobugcfg.h"
-#undef NOBUG_INIT_DEFS_
-
-#include <exception>
-
 
 using util::isnil;
 using util::cStr;
@@ -43,6 +37,10 @@ namespace lumiera
 #define LUMIERA_VERSION 0++devel
 #endif
 
+  Symbol ON_BASIC_INIT      ("ON_BASIC_INIT");
+  Symbol ON_GLOBAL_INIT     ("ON_GLOBAL_INIT");
+  Symbol ON_GLOBAL_SHUTDOWN ("ON_GLOBAL_SHUTDOWN");
+  
 
   /** perform initialization triggered on first access. 
    *  Will execute the ON_BASIC_INIT hook, but under typical
@@ -50,24 +48,16 @@ namespace lumiera
    *  added to this hook, the Appconfig singleton instance has
    *  already been created. For this reason, there is special
    *  treatment for the ON_BASIC_INIT in LifecycleHook::add,
-   *  causing the provided callbacks being fired immediately.
-   *  (btw, this is nothing to be worried of, for the client
-   *  code it just behaves like intended). 
+   *  causing the provided callbacks to be fired immediately.
+   *  (btw, this is nothing to be worried of, because from
+   *  client codes POV it just behaves like intended). 
    */
   Appconfig::Appconfig()
     : configParam_  (new Configmap),
       lifecycleHooks_(new LifecycleRegistry)
   {
-    ////////// 
-    NOBUG_INIT;
-    //////////
-    
-    INFO(config, "Basic application configuration triggered.");
     lifecycleHooks_->execute (ON_BASIC_INIT);   // note in most cases a NOP
     
-    // install our own handler for undeclared exceptions
-    std::set_unexpected (lumiera::error::lumiera_unexpectedException);
-    
     (*configParam_)["version"] = STRINGIFY (LUMIERA_VERSION);
   }
   
@@ -81,12 +71,12 @@ namespace lumiera
     try
       {
         const string& val = (*instance().configParam_)[key];
-        WARN_IF( isnil(val), config, "undefined config parameter \"%s\" requested.", key.c_str());
+        WARN_IF ( isnil(val), config, "undefined config parameter \"%s\" requested.", key.c_str());
         return val;
       }
     catch (...)
       {
-        ERROR(config, "error while accessing configuration parameter \"%s\".", key.c_str());
+        ERROR (config, "error while accessing configuration parameter \"%s\".", key.c_str());
         static string NOTFOUND ("");
         return NOTFOUND;
   }   }
@@ -114,9 +104,9 @@ namespace lumiera
   LifecycleHook&
   LifecycleHook::add (Symbol eventLabel, Callback callbackFun)
   {
-    Appconfig::instance().lifecycleHooks_->enroll (eventLabel,callbackFun);
+    bool isNew = Appconfig::instance().lifecycleHooks_->enroll (eventLabel,callbackFun);
     
-    if (!strcmp(ON_BASIC_INIT, eventLabel))
+    if (isNew && !strcmp(ON_BASIC_INIT, eventLabel))
       callbackFun();  // when this code executes,
                      //  then per definition we are already post "basic init"
                     //   (which happens in the Appconfig ctor); thus fire it immediately
diff --git a/src/common/appconfig.hpp b/src/lib/appconfig.hpp
similarity index 87%
rename from src/common/appconfig.hpp
rename to src/lib/appconfig.hpp
index 92180fe60..b82c3fa2b 100644
--- a/src/common/appconfig.hpp
+++ b/src/lib/appconfig.hpp
@@ -2,8 +2,7 @@
   APPCONFIG.hpp  -  for global initialization and configuration 
  
   Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
-                        Hermann Vosseler <Ichthyostega@web.de>
+    2008,               Hermann Vosseler <Ichthyostega@web.de>
  
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -44,9 +43,7 @@
 #include <string>
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
-#include "common/lifecycleregistry.hpp"
-
-#include "nobugcfg.h"
+#include "lib/lifecycleregistry.hpp"
 
 
 
@@ -69,7 +66,8 @@ namespace lumiera
     {
     private:
       /** perform initialization on first access.
-       *  @see #instance()              */
+       *  @see #instance()
+       */
       Appconfig ();
       
       ~Appconfig ()  throw()   {};  ///< deletion prohibited
@@ -79,7 +77,7 @@ namespace lumiera
     public:
       /** get the (single) Appconfig instance. 
        *  Implemented as Meyers singleton.
-       *  @warning don't use it in destruction code!
+       *  @warning don't use it after the end of main()!
        */
       static Appconfig& instance()
       {
@@ -90,12 +88,11 @@ namespace lumiera
       
       
       /** access the configuation value for a given key.
-       *  @return empty string for unknown keys, config value else
-       */
+       *  @return empty string for unknown keys, config value else */
       static const string & get (const string& key);  // never throws
       
       /** fire off all lifecycle callbacks
-       *  registered under the given label */
+       *  registered under the given label  */
       static void lifecycle (Symbol eventLabel);
       
       // note: if necessary, we can add support 
@@ -114,9 +111,9 @@ namespace lumiera
     };
     
   
-  Symbol ON_BASIC_INIT      ("ON_BASIC_INIT");         ///< automatic static init. treated specially
-  Symbol ON_GLOBAL_INIT     ("ON_GLOBAL_INIT");        ///< to be triggered in main()             @note no magic!
-  Symbol ON_GLOBAL_SHUTDOWN ("ON_GLOBAL_SHUTDOWN");    ///< to be triggered at the end of main()  @note no magic!
+  extern Symbol ON_BASIC_INIT;      ///< automatic static init. treated specially
+  extern Symbol ON_GLOBAL_INIT;     ///< to be triggered in main()             @note no magic!
+  extern Symbol ON_GLOBAL_SHUTDOWN; ///< to be triggered at the end of main()  @note no magic!
   
   // client code is free to register and use additional lifecycle events
   
diff --git a/src/common/lifecycleregistry.hpp b/src/lib/lifecycleregistry.hpp
similarity index 78%
rename from src/common/lifecycleregistry.hpp
rename to src/lib/lifecycleregistry.hpp
index 8b17a33b6..285c95fac 100644
--- a/src/common/lifecycleregistry.hpp
+++ b/src/lib/lifecycleregistry.hpp
@@ -39,22 +39,23 @@
 #define LUMIERA_LIFECYCLE_H
 
 #include <map>
-#include <vector>
-//#include <string>
-//#include <boost/scoped_ptr.hpp>
+#include <set>
+#include <string>
 #include <boost/function.hpp>
 #include <boost/noncopyable.hpp>
 
+#include "common/util.hpp"
 
 
 namespace lumiera
   {
-//  using std::string;
-//  using boost::scoped_ptr;
   using boost::noncopyable;
   using boost::function;
+  using util::contains;
+  using std::string;
 
-  typedef const char * const Symbol;  
+  typedef const char * const Symbol;  //TODO define a real Symbol class, i.e. same literal string==same pointer,
+                                      //     so we don't have to store string keys in the map...
 
   
   /**
@@ -67,17 +68,19 @@ namespace lumiera
     : private noncopyable
     {
     public:
-      typedef boost::function<void(void)> Hook;
-      typedef std::vector<Hook> Callbacks;
+      typedef void (*Hook)(void);
+      typedef std::set<Hook> Callbacks;
       typedef Callbacks::iterator Iter;
       
       
-      void enroll (Symbol label, Hook& toCall)
+      bool enroll (const string label, Hook toCall)
         {
-          table_[label].push_back(toCall);
+          return table_[label]
+                        .insert(toCall)
+                        .second;  // true if actually stored 
         }
       
-      void execute (Symbol label)
+      void execute (const string label)
         {
           Callbacks& cbs (table_[label]);
           Iter e = cbs.end();
@@ -88,7 +91,7 @@ namespace lumiera
       
       
     private:
-      std::map<Symbol, Callbacks> table_;
+      std::map<const string, Callbacks> table_;
       
       LifecycleRegistry ()  {}
       friend class Appconfig;
diff --git a/src/main.cpp b/src/main.cpp
index 398cdc3df..0e04ef89f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,16 +23,24 @@
 
 #include <iostream>
 
-#include "lumiera.h"
+#include "proc/lumiera.hpp"
 
 using std::cout;
 using std::endl;
 using lumiera::Appconfig;
+using lumiera::ON_GLOBAL_INIT;
+using lumiera::ON_GLOBAL_SHUTDOWN;
 
 
 int main (int argc, char* argv[])
 {
   cout << "*** Lumiera NLE for Linux ***" << endl
-       << "    Version: " << Appconfig::get("version") << endl;
+       << "    Version: " << Appconfig::get("version") << "\n";
+  
+  Appconfig::lifecycle (ON_GLOBAL_INIT);
+  
+  // great things are happening here....
+  
+  Appconfig::lifecycle (ON_GLOBAL_SHUTDOWN);
   return 0;
 }
diff --git a/src/pre.hpp b/src/pre.hpp
index 203613c3d..ca948b7d6 100644
--- a/src/pre.hpp
+++ b/src/pre.hpp
@@ -45,7 +45,7 @@
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 
-#include "lumiera.h"
+#include "proc/lumiera.hpp"
 
 
 
diff --git a/src/pre_a.hpp b/src/pre_a.hpp
index 34a8e72f2..6174b83e8 100644
--- a/src/pre_a.hpp
+++ b/src/pre_a.hpp
@@ -42,7 +42,7 @@
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 
-#include "lumiera.h"
+#include "proc/lumiera.hpp"
 #include "proc/asset.hpp"
 
 
diff --git a/src/proc/asset/category.cpp b/src/proc/asset/category.cpp
index 490f1f0d6..dcb767ccf 100644
--- a/src/proc/asset/category.cpp
+++ b/src/proc/asset/category.cpp
@@ -23,7 +23,7 @@
 
 #include "proc/asset/category.hpp"
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp
index 477ac4d9d..a91e8284b 100644
--- a/src/proc/asset/media.cpp
+++ b/src/proc/asset/media.cpp
@@ -29,7 +29,7 @@
 #include "proc/mobject/session/clip.hpp"
 #include "proc/mobject/session/mobjectfactory.hpp"
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 #include <boost/regex.hpp>
 #include <boost/format.hpp>
diff --git a/src/proc/asset/meta.cpp b/src/proc/asset/meta.cpp
index bdfd1c411..ec58b493c 100644
--- a/src/proc/asset/meta.cpp
+++ b/src/proc/asset/meta.cpp
@@ -24,7 +24,7 @@
 #include "proc/assetmanager.hpp"
 #include "proc/asset/meta.hpp"
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 
 namespace asset
diff --git a/src/proc/asset/proc.cpp b/src/proc/asset/proc.cpp
index 87aa48da6..3720f0993 100644
--- a/src/proc/asset/proc.cpp
+++ b/src/proc/asset/proc.cpp
@@ -24,7 +24,7 @@
 #include "proc/assetmanager.hpp"
 #include "proc/asset/proc.hpp"
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 
 namespace asset
diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp
index 10eaf15ef..6e85c50c2 100644
--- a/src/proc/asset/struct.cpp
+++ b/src/proc/asset/struct.cpp
@@ -31,7 +31,7 @@
 #include "proc/asset/structfactoryimpl.hpp"
 
 #include "common/util.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 #include <boost/format.hpp>
 
diff --git a/src/proc/engine/processor.hpp b/src/proc/engine/processor.hpp
index 6b7317886..164fa8bfa 100644
--- a/src/proc/engine/processor.hpp
+++ b/src/proc/engine/processor.hpp
@@ -24,7 +24,7 @@
 #ifndef ENGINE_PROCESSOR_H
 #define ENGINE_PROCESSOR_H
 
-#include "lumiera.h"
+#include "proc/lumiera.hpp"
 #include "proc/stateproxy.hpp"
 
 
diff --git a/src/lumiera.h b/src/proc/lumiera.hpp
similarity index 68%
rename from src/lumiera.h
rename to src/proc/lumiera.hpp
index 12b1578b9..b56ab69b6 100644
--- a/src/lumiera.h
+++ b/src/proc/lumiera.hpp
@@ -1,5 +1,5 @@
 /*
-  LUMIERA.h  -  global definitions and common types
+  LUMIERA.hpp  -  global definitions and common types for the Proc-Layer
  
  
   Copyright (C)         Lumiera.org
@@ -27,31 +27,13 @@
 
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* ========================== common C Part ============ */
-
-
-#ifdef __cplusplus
-}
-#endif /* ==================== (End) common C Part ============ */
-
-
-
-
-
-#ifndef __cplusplus
-#include "nobugcfg.h"
-
-#else  /* ========================== C++-Part ================= */
-
 
     /* common types frequently used... */
 
 #include "common/util.hpp"
 #include "common/time.hpp"
-#include "common/appconfig.hpp" // includes NoBug via "nobugcfg.h"
-#include "common/error.hpp"
+#include "common/error.hpp"   ///< pulls in NoBug via nobugcfg.hpp
+#include "lib/appconfig.hpp"
 
 
 namespace lumiera
@@ -61,6 +43,4 @@ namespace lumiera
     
 } // namespace lumiera
 
-#endif /* ===================== (End) C++-Part ================= */
-
 #endif /*LUMIERA_H*/
diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp
index 3d0222a3d..a8c02c761 100644
--- a/src/proc/mobject/mobject.hpp
+++ b/src/proc/mobject/mobject.hpp
@@ -29,7 +29,7 @@
 #include <list>
 #include <tr1/memory>
 
-#include "lumiera.h"
+#include "proc/lumiera.hpp"
 #include "proc/mobject/builder/buildertool.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/asset.hpp"                 // TODO finally not needed?
diff --git a/src/proc/mobject/session/fixture.cpp b/src/proc/mobject/session/fixture.cpp
index bdad3f807..19ba84970 100644
--- a/src/proc/mobject/session/fixture.cpp
+++ b/src/proc/mobject/session/fixture.cpp
@@ -22,7 +22,7 @@
 
 
 #include "proc/mobject/session/fixture.hpp"
-#include "nobugcfg.h"
+#include "proc/nobugcfg.hpp"
 
 namespace mobject
   {
diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp
index 009778eb3..f978d4f4e 100644
--- a/src/proc/mobject/session/locatingpin.hpp
+++ b/src/proc/mobject/session/locatingpin.hpp
@@ -42,7 +42,7 @@
 #define MOBJECT_SESSION_LOCATINGPIN_H
 
 
-#include "lumiera.h"
+#include "proc/lumiera.hpp"
 
 #include <utility>
 #include <tr1/memory>
diff --git a/src/proc/mobject/session/segment.hpp b/src/proc/mobject/session/segment.hpp
index 0b8a6025b..4d978f810 100644
--- a/src/proc/mobject/session/segment.hpp
+++ b/src/proc/mobject/session/segment.hpp
@@ -26,7 +26,7 @@
 
 #include <list>
 
-#include "lumiera.h"
+#include "proc/lumiera.hpp"
 #include "proc/mobject/explicitplacement.hpp"
 
 
diff --git a/src/proc/nobugcfg.cpp b/src/proc/nobugcfg.cpp
new file mode 100644
index 000000000..7dc68a9bb
--- /dev/null
+++ b/src/proc/nobugcfg.cpp
@@ -0,0 +1,45 @@
+/*
+  NoBugCfg  -  NoBug definitions and initialisation for the Proc-Layer 
+ 
+  Copyright (C)         Lumiera.org
+    2008,               Christian Thaeter <ct@pipapo.org>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "proc/nobugcfg.hpp"
+
+#define NOBUG_INIT_DEFS_
+#include "proc/nobugcfg.hpp"
+#undef NOBUG_INIT_DEFS_
+
+
+namespace lumiera
+  {
+  void 
+  initialize_NoBug () 
+  {
+    NOBUG_INIT;
+    
+#ifdef DEBUG
+    static uint callCount = 0;
+    ASSERT ( 0 == callCount++ );
+#endif    
+  }
+
+}
+
diff --git a/src/nobugcfg.h b/src/proc/nobugcfg.hpp
similarity index 74%
rename from src/nobugcfg.h
rename to src/proc/nobugcfg.hpp
index 916f28663..567838320 100644
--- a/src/nobugcfg.h
+++ b/src/proc/nobugcfg.hpp
@@ -1,5 +1,5 @@
 /*
-  NOBUGCFG.h  -  global configuration and definitions for NoBug
+  NOBUGCFG.hpp  -  NoBug definitions and initialisation for the Proc-Layer
  
  
   Copyright (C)         Lumiera.org
@@ -22,17 +22,20 @@
  
 */
 
-/** @file nobugcfg.h
+/** @file nobugcfg.hpp
  ** This header is for including and configuring NoBug.
  ** The idea is that configuration and some globally used flag 
  ** declarations are to be kept in one central location. Normally,
- ** this header will be included by appconfig.hpp, which in turn gets
- ** included by lumiera.h
+ ** this header will be included via some of the basic headers like
+ ** error.hpp, which in turn gets included by proc/lumiera.hpp
+ **
  ** @par Besides the usual guarded declarations, this header contains
  ** one section with the corresponding <b>definitions</b>. This section
- ** is to be called by appconfig.cpp only, which deals with application
- ** wide configuration values contained in the Singleton class Appconfig.
- ** Incidentally, the constructor of Appconfig issues the NOBUG_INIT call
+ ** is to be included once by some translation unit (currently this is
+ ** nobugcfg.cpp) in order to generate the necessary definitions.
+ **
+ ** @note this header assures automatic initialisation of NoBug
+ **       by placing a static ctor call.
  **
  */
 
@@ -41,10 +44,9 @@
 #define NOBUGCFG_H
 
 #include <syslog.h>
-
-  /* configuration of NoBug goes here... */
-
 #include <nobug.h>
+#include "lib/appconfig.hpp"
+#include "common/error.hpp"  ///< make assertions throw instead of abort()
 
 
   /* declare flags used throughout the code base... */
@@ -54,8 +56,13 @@
   NOBUG_DECLARE_FLAG(singleton);
   NOBUG_DECLARE_FLAG(assetmem);
   NOBUG_DECLARE_FLAG(mobjectmem);
-
-
+  
+  
+namespace lumiera { 
+  void initialize_NoBug ();
+  namespace {
+    LifecycleHook schedule_ (ON_BASIC_INIT, &initialize_NoBug);         
+} }  
 #endif /*NOBUGCFG_H    ======= (End) Part 1: DECLARATIONS ======== */
 
 
@@ -65,15 +72,6 @@
 
 #ifdef NOBUG_INIT_DEFS_ /*========== Part 2: DEFINITIONS ========= */
 
-/* ================================= common C Part ========= */
-
-
-
-
-
-
-#ifdef __cplusplus /* ============== C++-Part ============== */
-
 
   /* flags used throughout the code base... */
   NOBUG_CPP_DEFINE_FLAG(config);
@@ -83,11 +81,7 @@
   NOBUG_CPP_DEFINE_FLAG_LIMIT(assetmem,  LOG_WARNING);
   NOBUG_CPP_DEFINE_FLAG_LIMIT(mobjectmem, LOG_WARNING);
 
-#include "common/error.hpp"
   
 
-#endif /* ===================== (End) C++-Part ============= */
-
-
 
 #endif /*NOBUG_INIT_DEFS_ ==== (End) Part 2: DEFINITIONS ========= */
diff --git a/tests/common/appconfigtest.cpp b/tests/common/appconfigtest.cpp
index 215c8c46c..c51b413bc 100644
--- a/tests/common/appconfigtest.cpp
+++ b/tests/common/appconfigtest.cpp
@@ -22,11 +22,11 @@
 
 
 
-#include "common/appconfig.hpp"
-
 #include "common/test/run.hpp"
 #include "common/util.hpp"
 
+#include "lib/appconfig.hpp"
+
 
 
 
diff --git a/tests/common/exceptionerrortest.cpp b/tests/common/exceptionerrortest.cpp
index 75a13d0ee..6bc97afbb 100644
--- a/tests/common/exceptionerrortest.cpp
+++ b/tests/common/exceptionerrortest.cpp
@@ -24,7 +24,6 @@
 
 #include "lib/error.h"
 #include "common/error.hpp"
-#include "common/appconfig.hpp"
 
 #include "common/test/run.hpp"
 #include "common/util.hpp"
@@ -182,13 +181,11 @@ namespace lumiera
         /** @test terminate the Application by throwing an undclared exception.
          *        this should result in the global unknown() handler to be called,
          *        so usually it will terminate the testrun. 
-         *  @note because we call Appconfig::instance(), our own unknown() handler
-         *        gets installed and invoked, which gives additional diagnostics.*/
+         *  @note inside error.hpp, an initialisation hook has been installed into
+         *        Appconfig, causing our own unknown() handler to be installed and
+         *        invoked, which gives additional diagnostics.*/
         void terminateUnknown ()  throw() 
         {
-          lumiera::Appconfig::instance();
-          // will cause initialisation of Appconfig,
-          
           throw Error("You'll never get me, won't you?");
         }
         
diff --git a/tests/common/lifecycletest.cpp b/tests/common/lifecycletest.cpp
index 5e5a779a1..21a33dce5 100644
--- a/tests/common/lifecycletest.cpp
+++ b/tests/common/lifecycletest.cpp
@@ -22,11 +22,11 @@
 
 
 
-#include "common/appconfig.hpp"
-
 #include "common/test/run.hpp"
 #include "common/util.hpp"
 
+#include "lib/appconfig.hpp"
+
 
 
 
@@ -35,11 +35,11 @@ namespace lumiera
   namespace test
     {
     
-    bool basicInit (false);
-    bool customCallback (false);
+    uint basicInit (0);
+    uint customCallback (0);
     
-    void basicInitHook () { basicInit = true; }
-    void myCallback() { customCallback = true; }
+    void basicInitHook () { ++basicInit; }
+    void myCallback() { ++customCallback; }
 
     Symbol MY_MAGIC_MEGA_EVENT = "dial M for murder";
     
@@ -61,10 +61,11 @@ namespace lumiera
         run (Arg arg)
           {
             ASSERT (basicInit, "the basic-init callback hasn't been invoked automatically");
+            ASSERT (1 == basicInit, "the basic-init callback has been invoked more than once");
             
             ASSERT (!customCallback);
             Appconfig::lifecycle (MY_MAGIC_MEGA_EVENT);
-            ASSERT ( customCallback);
+            ASSERT ( 1 == customCallback);
           }
         
       };
diff --git a/tests/common/mainsuite.cpp b/tests/common/mainsuite.cpp
index aa500cdbe..3ef740744 100644
--- a/tests/common/mainsuite.cpp
+++ b/tests/common/mainsuite.cpp
@@ -23,6 +23,12 @@
 
 #include "common/test/suite.hpp"
 #include "common/test/testoption.hpp"
+#include "lib/appconfig.hpp"
+
+using lumiera::Appconfig;
+using lumiera::ON_GLOBAL_INIT;
+using lumiera::ON_GLOBAL_SHUTDOWN;
+
 
 /** run all tests or any single test specified in the first
  *  cmd line argument.
@@ -33,10 +39,13 @@ int main (int argc, char* argv[])
   util::Cmdline args (argc,argv);
   test::TestOption optparser (args);
   test::Suite suite (optparser.getTestgroup());
+  Appconfig::lifecycle(ON_GLOBAL_INIT);
   
   if (optparser.getDescribe())
     suite.describe();
   else
     suite.run (args);
+
+  Appconfig::lifecycle(ON_GLOBAL_SHUTDOWN);
   return 0;
 }