Index: tolbase/lib/markupparser/a.html
===================================================================
--- tolbase/lib/markupparser/a.html	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<html><head><title>a.txt</title></head>
-<body>
-
-<h1>a.txt</h1>
-
-<p>Now is the time for all good men to come to
-the aid of their country.</p>
-</body>
Index: tolbase/lib/markupparser/a.txt
===================================================================
--- tolbase/lib/markupparser/a.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,2 +1,0 @@
-Now is the time for all good men to come to
-the aid of their country.
Index: tolbase/lib/markupparser/b.txt
===================================================================
--- tolbase/lib/markupparser/b.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,8 +1,0 @@
-This is normal text.
-
-* This is a bullet.
-** This is a sub-bullet.
-*** This is a sub-sub-bullet.
-* Back to the first level.
-
-This is more normal text.
Index: tolbase/lib/markupparser/bench.text
===================================================================
--- tolbase/lib/markupparser/bench.text	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,696 +1,0 @@
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
-This is a one line paragraph.
-
-This is a <b>two</b> line [paragraph with] a link
-and a [%Button|magic%].
-
-:: This is a two line indented paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
-** This is a two line bulleted paragraph that's supposed to wrap to
-the next line because it's so long and to be indented properly when it
-gets there.
-
- This is a two line 
-Preformatted paragraph.
-* <i>Three</i>
-** Bulleted
-*** Paragraphs
-#---
-And here's a <m>paragraph</m> with [%One|button%]
-and [%Another|Button [with brackets]%].
-
-[@Bogus Macro@]
-#hash check
-: And one <h>indented</h> one.
-
-And the rest is preformatted,
-* No matter what it is.
-
Index: tolbase/lib/markupparser/c.txt
===================================================================
--- tolbase/lib/markupparser/c.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,14 +1,0 @@
-This is normal text.
-
-: This is indented text.
-* This is a bullet.
-: This is text under the bullet.
-** This is a sub-bullet.
-
-:: This is text under the bullet.
-*** This is a sub-sub-bullet.
-::: This is text under the bullet.
-*** This is another sub-sub-bullet.
-* Back to the first level.
-
-This is more normal text.
Index: tolbase/lib/markupparser/d.txt
===================================================================
--- tolbase/lib/markupparser/d.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,13 +1,0 @@
-There's a small problem in that there's a blank line between here...
-: ...and here.
-
-This is another term.
-: This is another definition.
-
-: This Definition gives rise to another list of terms.
-
-: First Term
-:: Its definition
-
-: Second Term
-:: Its definition.
Index: tolbase/lib/markupparser/e.txt
===================================================================
--- tolbase/lib/markupparser/e.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,4 +1,0 @@
-This is some text. <m>mono <b>bold <i>italic</i> bold</b> mono</m>.
-<h>Header <s>Small</s> Header</h>.
-
-Some more text.  <i>Italic.</i>  <b>Bold.</b> <x>Strike-through!</x>
Index: tolbase/lib/markupparser/example1.txt
===================================================================
--- tolbase/lib/markupparser/example1.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-Now is <b>the</b> <m>time<m> for <i>all</i> <s>good</s> men 
-to come to the aid of their country.
-#---
-[@macro@] Now is the time for all good men to come to the aid of their country.
-
-[%button|command%] Now is the time for all good men to come to the aid of their country.
-
-*   Now is the time for all [good men] to come to the aid of their
-country.
-** Now is the time for all good men to come to the aid of their
-   country.
-*** Now is the time for all good men to come to the aid of their
-    country.
-
-#Tcl
-howdy world
-#unTcl
-
-: Now is the time for all good men to come to the aid of their
-country.
-:: Now is the time for all good men to come to the aid of their
-country.
-::: Now is the time for all good men to come to the aid of their
-country.
-
-
Index: tolbase/lib/markupparser/f.txt
===================================================================
--- tolbase/lib/markupparser/f.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-[@notebooklinks@]
-
-Bugs:
-
-* Sometimes the viewer pane loses the focus...and when that happens, some
-  of the menu items (notably "edit-page") stop working.  Clicking on the
-  viewer pane doesn't get you the focus.  I suspect this is Mac OS X only
-  and that it's due to changed behavior in 8.4.7.
-
-<h>Design Notes</h>
-
-* [Notebook: Intermediate Form]
-* [Notebook: Architecture]
-* [Notebook: Revised Action Management]
-* [Notebook: Actions, Methods, and Notebook Commands]
-* [Notebook: Message Handling]
-* [Notebook: Action Manager]
-* [Notebook: Safe User Code]
-* [Notebook: Error Reporting]
-* [Notebook Electric Characters]
-
-<h>Notebook Components</h>
-
-* [notebookbrowser]
-** [pageviewer]
-*** [renderpane]
-** [pageeditor]
-* [helpbrowser]
-* [dbmanager]
-* [notebookdb]
-
-<h>Other Topics</h>
-
-* [Notebook Markup Optimization]
-* [Notebook User Preferences]
-* [Template: Notebook]
-
-#---
-[Notebook: Index]
Index: tolbase/lib/markupparser/g.txt
===================================================================
--- tolbase/lib/markupparser/g.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,7 +1,0 @@
-Line 1
-
-Line 2
-
-#pre
-Something preformatted
-#unpre
Index: tolbase/lib/markupparser/h.txt
===================================================================
--- tolbase/lib/markupparser/h.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,6 +1,0 @@
-This is some text.
-#meta author Joe Blow
-#meta title A Life in Chewing Gum
-This is some more text.
-#meta foo
-#meta bar      asdf  asd   asdf     
Index: tolbase/lib/markupparser/i.txt
===================================================================
--- tolbase/lib/markupparser/i.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,6 +1,0 @@
-This is some text
-
-#data FOO
-     Some data
-     of an unknown type
-#undata foo
Index: tolbase/lib/markupparser/j.txt
===================================================================
--- tolbase/lib/markupparser/j.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,9 +1,0 @@
-This is some text
-
-#data FOO
-     Some data
-     of an unknown type
-#undata foo
-
-This is some more text <thru>with a <b>thru</b>
-component</thru> in it.
Index: tolbase/lib/markupparser/lshift.tcl
===================================================================
--- tolbase/lib/markupparser/lshift.tcl	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,15 +1,0 @@
-  proc lshift {listvar} {
-      upvar $listvar args
-      
-      if {[llength $args] == 0} {
-          set arg ""
-      } elseif {[llength $args] == 1} {
-          set arg [lindex $args 0]
-          set args ""
-      } else {
-          set arg [lindex $args 0]
-          set args [lrange $args 1 end]
-      }
-      
-      return $arg
-  }
Index: tolbase/lib/markupparser/new.txt
===================================================================
--- tolbase/lib/markupparser/new.txt	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,152 +1,0 @@
-markupparser 2.0
------------------------------------------------------------------
-
-markupparser parses Notebook markup into an intermediary form,
-a flat list of tag/value pairs.  The parsing proceeds by first 
-breaking the input into chunk, where each chunk consists
-of one or more full lines of text.  There are (at present)
-four kinds of chunk:
-
-Directives
-    A directive is a line beginning with a hash "#" character;
-    the specific directive is determined by the text that follows
-    the hash character.  Unless otherwise indicated, any 
-    subsequent text on the line is ignored.  Unrecognized
-    directives are permitted.  The existing directives are as 
-    follows:
-
-    #--- 
-        Rendered as a horizontal line, e.g., <hr>.
-
-    #pre
-        Begins a chunk of preformatted text.
-
-    #unpre
-        Ends a chunk of preformatted text.
-
-    #Tcl
-        Begins a chunk of Tcl Code
-
-    #unTcl
-        Ends a chunk of Tcl Code
-
-    Eventually, I intend the add the following directives
-    as a general extension mechanism:
-
-    #meta <keyword> <value>
-        Defines a named value associated with the pages.  It will be
-        possible to query a page for its metadata.
-
-    #data <typename>
-        Begins a data chunk.  A data chunk is just like a Tcl Code or
-        preformatted text chunk in terms of how it's handled; however,
-        it will allow other code to easily extract data of a specific
-        type from a page.  Eventually, it might be possible to add
-        rendering plugins for specific data types.
-
-    #undata
-        Ends a data chunk.
-
-Preformatted
-    A preformatted chunk is to be rendered verbatim in a
-    fixed-width font.  Performatted chunks are found in two
-    ways: either a paragraph whose first line begins with
-    a whitespace character, or a group of lines beginning with
-    a "#pre" directive and ending with a "#unpre" directive
-    (or the end of the input).  (The directives are not
-    part of the chunk.)
-
-Tcl Code
-    A Tcl code chunk is usually rendered Preformatted; it is
-    a group of lines bracketed by "#Tcl" and "#unTcl".
-
-Wrapped Text
-    A wrapped text paragraph consists of one or more lines of 
-    possibly styled text.  Wrapped text paragraphs can be 
-    indented; if indented they can have a bullet.  Wrapped
-    text can also contain links, magic buttons, and embedded
-    macros.
-
-    Note: embedded macros are usually expanded *before* parsing
-    the markup, so usually there won't be any in the input.  If
-    there are any, they could be anywhere, in any kind of text.
-    However, the parser will only recognize them in wrapped text.
-
-Intermediate Form
------------------------------------------------------------------
-
-The parser parses the input and produces the intermediate form,
-a flat list of tag/value pairs.  The tags and their values are
-defined as follows:
-
-
-HASH <directive>
-    One of these pairs is produced for each directive; the value is
-    the complete line of text, including the newline at the end.
-
-PRE <text>
-    This is usually Preformatted text, to be displayed verbatim.  The
-    value is the exact set of lines from the input.  If the chunk was
-    delimited by "#pre" and "#unpre" directives, then this tag/value
-    will be preceded and followed by the appropriate HASH tag/values.
-
-TCL <text> 
-    The <text> is a chunk of Tcl code. This tag/value will be preceded
-    and followed by the "#Tcl" and "#unTcl" HASH tag/values.
-
-P {:|* <indent> <leading>} 
-    Begins a paragraph of wrapped text.  The value is a list of three
-    items: the paragraph type (":" or "*"), the indent level (0 or
-    higher) and (for indented and bulleted paragraphs) the leading
-    string, which is the whitespace between the initial "*" or ":"
-    and the paragraph text.  (It's used to reconstruct a parsed page
-    just exactly as it was.)
-
-    A normal, non-indented non-bulleted paragraph will begin with
-
-        P {: 0 {}}
-
-    A paragraph with an indent level of 1 will begin with this
-    (where the length of the leading string depends on the actual
-    input):
-
-        P {: 1 { }}
-
-    A bulleted paragraph with an indent level of 1 will begin with
-    this:
-
-        P {* 1 { }}
-
-    For bulleted paragraphs, the indent level must be 1 or more.
-    Note that a normal paragraph is simply an indented paragraph
-    with an indent level of zero.
-
-/P
-    Terminates a paragraph of wrapped text, of whatever kind.
-
-The following tags represent components of a paragraph of wrapped
-text; they will always appear between P and /P.
-
-TXT <text>
-    The value is plain text to be wrapped and rendered.
-
-STY <style-code>
-    The value is a style code, e.g. <b> or </b>.  All styles are
-    cancelled at the end of the paragraph; also, some styles are
-    mutually exclusive.
-
-    It might be desirable to make the value a list of two elements.
-    The first element would be the style-code; the second would be
-    some kind of string indicating the currently active styles.
-    That way the style-logic would be done by the parser, not by
-    each renderer.
-
-LINK <link text> 
-    The value is a page link, not including the [ and ].
-
-BTN <button text|command>
-    The value is the definition of a magic button, not including the
-    [% and %].
-
-MACRO <macro> 
-    The value is an embedded macro command, not including the [@ and @].
Index: tolbase/lib/markupparser/test.html
===================================================================
--- tolbase/lib/markupparser/test.html	(revision a6809837c3cf682c25aa299cb4b175153c0399bb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<html><head><title>Home</title></head>
-<body>
-
-<h1>Home</h1>
-
-<p>Hi! Welcome to your new Notebook!
-</p>
-<p>You should probably look at the topics on the Help menu
-to find out more about your Notebook, but here are some things to 
-get you started.  Click on them to see what they are all about.
-</p>
-
-<ul>
-<li> Take a quick Tour of the features of your notebook.
-<p></p>
-<li> The Index is an index of all of the pages in your notebook.  You can
-  also press the "Index" button, above, or select "Page/Index" from the menu.
-<p></p>
-<li> Create new pages on the New Pages page, or anywhere else you like!
-<p></p>
-<li> You can edit any page by pressing the "Edit" button, above, or by selecting
-  "Page/Edit" from the menu.
-<p></p>
-<li> Try things in the Sandbox.
-V2.1.0
-<p></p>
-<pre>Some preformatted text.
-Some more preformatted text.
-</pre>
-<p></p>
-</ul>
-
-<p>Some normal text
-</p>
-
-<ul>
-<li> With markup.</ul>
-
-
-</body>
-</html>