Added [[dev:foo]] namespace for device files

Added [[dir:foo]] for directories
Added ability to nest ordered and itemized lists up to four levels each.
Updated documentation

LDP/wt2db/Changelog

@@ -1,28 +1,38 @@
 2002-05-01	0.3	Initial public release.
 
 2002-05-24	0.4	Added -a, --article option.
-			This option wraps the document content in <article>
-			tags, and prefixes the file with a DocBook 4.1.2
-			DOCTYPE declaration.
+            This option wraps the document content in <article>
+            tags, and prefixes the file with a DocBook 4.1.2
+            DOCTYPE declaration.
 
-			Added <articleinfo> as a literal section, so a user
-			can write their own meta-data when not using
-			Lampadas and still get a complete DocBook file.
+            Added <articleinfo> as a literal section, so a user
+            can write their own meta-data when not using
+            Lampadas and still get a complete DocBook file.
 
-CVS			Switched -V and -v, now -v is version, -V is verbose.
-			Changed -a, --article to -x, --xml and -s, --sgml to
-			let you pick your own doctype.
+CVS         Switched -V and -v, now -v is version, -V is verbose.
+            Changed -a, --article to -x, --xml and -s, --sgml to
+            let you pick your own doctype.
 
-			Added -n, --nonet parameter to disable network
-			lookups.
+            Added -n, --nonet parameter to disable network
+            lookups.
 
-			Fixed bug in screen blocks, para tags were being
-			closed when not open.
+            Fixed bug in screen blocks, para tags were being
+            closed when not open.
 
-			Deleted [ for <filename>, added [[file: namespace.
-			
-			[[ is now for internal links and become <xref>.
+            Deleted [ for <filename>, added [[file:]] namespace instead.
+            This is less likely to generate false positives.
+            
+            [[ is now for internal links and become <xref>.
 
             Encoding of literal block tags into entities.
 
             Added -e, --encoding to specify encoding.            
+
+            Added [[dir:foo]] for directories.
+
+            Added [[dev:foo]] for device files.
+
+            Added ability to nest ordered lists and itemized lists
+            up to four levels deep, mix-and-match.
+
+            "#" and "*" for lists no longer have to be in the first column.

LDP/wt2db/doc/wt2db.pod

@@ -26,6 +26,8 @@ B<-x>, B<--xml> add XML DOCTYPE and article tags.
 
 B<-s>, B<--sgml> add SGML DOCTYPE and article tags.
 
+B<-e>, B<--encoding> specify the document encoding.
+
 B<-n>, B<--nonet> do not access the network.
 
 B<-o>, B<--output-to> I<filename> write to the specified file.
@@ -123,11 +125,33 @@ tag. Usage should be obvious in context.
                             </listitem>
                         </simplelist>
 
+Both ordered and unordered lists can be nested by increasing the number
+of "#" or "*" indicators, and ordered and unordered lists can also be
+nested inside each other. B<wt2db> supports a depth of up to four
+itemized and/or four ordered lists. When nesting an itemized list
+inside another itemized list, or an ordered list inside an ordered list,
+repeat the "#" or "*" character to indicate the desired nesting level.
+When nesting an itemized list inside an ordered list or vice versa,
+it is not necessary to specify the depth, but it is recommended for clarity.
+
+ *Foo                   Nests one itemized list inside another.
+   **Bar
+   **Baz
+ *Quux
+
+ *Foo                   Nests an ordered list inside an itemized list.
+  #Bar
+  #Baz
+ *Quux
+
  [[foo]]                <xref linkend='foo' linkterm='foo'/>
  [[link:Foo]]
 
- [[file:/dev/foo]]      <filename>/dev/foo</filename>
+ [[file:/etc/foo]]      <filename>/etc/foo</filename>
 
+ [[dir:/etc]]           <filename class="directory">/etc</filename>
+
+ [[dev:/dev/ttyS0]]     <filename class="devicefile">/dev/ttyS0</filename>
 
  [[http://foo.org]]     <ulink url='http://foo.org'>
                             <citetitle>http://foo.org</citetitle>

LDP/wt2db/test.pl

@@ -26,6 +26,21 @@ paragraph
 [[http://www.tldp.org]]
 [[http://www.tldp.org|The Linux Documentation Project]]
 
+*one
+    **two
+    **two, again
+    /**
+
+    ## ordered
+    /#
+
+    **two once more
+    **two yet again
+/*
+
+
+Foo
+
 ";
 
 $outbuf = '';

LDP/wt2db/wt2db

@@ -2,7 +2,7 @@
 #
 #Converts txt files into DocBook XML/SGML.
 #
-$VERSION = '0.4-cvs';
+$VERSION = '0.4-CVS';
 
 use Wt2Db;
 $WT2DB = new Wt2Db;