diff options
| -rw-r--r-- | BUGS.txt | 4 | ||||
| -rw-r--r-- | CHANGELOG.txt | 6 | ||||
| -rw-r--r-- | dblatex/dblatex-readme.txt | 14 | ||||
| -rw-r--r-- | doc/asciidoc.dict | 34 | ||||
| -rw-r--r-- | doc/asciidoc.txt | 64 | ||||
| -rw-r--r-- | examples/website/index.txt | 6 | ||||
| -rw-r--r-- | examples/website/newtables.txt | 74 |
7 files changed, 71 insertions, 131 deletions
@@ -24,3 +24,7 @@ AsciiDoc - Multiple comma separated command names in the manpage NAME section translate to a single DocBook `refname` instead of multiple `refname` elements. + +dblatex +------- +See `./dblatex/dblatex-readme.txt`. diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3ae2734..936671b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1023,10 +1023,10 @@ Version 5.0.6 (2004-03-07) - A replacement has been added to `asciidoc.conf` to replace inline
double dashes with the `—` entity.
- Changed the `.UNDER-CONSTRUCTION.` macro syntax to
- `\#UNDER-CONSTRUCTION#` so it is not mistaken for a BlockTitle.
+ `#UNDER-CONSTRUCTION#` so it is not mistaken for a BlockTitle.
Similarly changed the `.NEW.` replacement with
- `{amp}\#35;NEW{amp}#35;`.
-- `{amp}\#35;NEW{amp}#35;` and `\#UNDER-CONSTRUCTION#` macros are now
+ `#NEW#`.
+- `#NEW#` and `#UNDER-CONSTRUCTION#` macros are now
included in the DocBook backend.
- Replaced shipped `smallnew.gif` with `smallnew.png`.
- Documentation tidy ups.
diff --git a/dblatex/dblatex-readme.txt b/dblatex/dblatex-readme.txt index 8cc9059..39bb437 100644 --- a/dblatex/dblatex-readme.txt +++ b/dblatex/dblatex-readme.txt @@ -20,16 +20,20 @@ Limitations ----------- Observed in dblatex 0.2.8. -- dblatex doesn't seem to process the DocBook <literallayout> element - correctly: it is rendered in a monospaced font and no nested +- dblatex doesn't seem to process the DocBook 'literallayout' element + correctly: it is rendered in a monospaced font and no inline elements are processed. By default the normal font should be used and almost all DocBook inline elements should be processed (http://www.docbook.org/tdg/en/html/literallayout.html). I almost fixed this by overriding the default dblatex literallayout template - (in `./dblatex/asciidoc-dblatex.xsl`) but there is a remaining - problem: blank lines are replaced by a single space. + (in `./dblatex/asciidoc-dblatex.xsl`) and using the LaTeX 'alltt' + package, but there are remaining problems: -- Callouts do not work inside DocBook <literallayout> elements which + * Blank lines are replaced by a single space. + * The 'literallayout' element incorrectly wraps text when rendered + inside a table. + +- Callouts do not work inside DocBook 'literallayout' elements which means callouts are not displayed inside AsciiDoc literal blocks. A workaround is to change the AsciiDoc literal block to a listing block. diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict index dc6bb20..de5348b 100644 --- a/doc/asciidoc.dict +++ b/doc/asciidoc.dict @@ -1,7 +1,7 @@ personal_ws-1.1 en 686 Sturmer -Kléber Kleber +Kléber quis auctor linkcss @@ -12,8 +12,8 @@ BOLID callouts bulleted starttags -ListingBlock listingblock +ListingBlock eval asc https @@ -47,8 +47,8 @@ PassthroughBlock aliquam munere startup -listcontinuation ListContinuation +listcontinuation consectetuer Magnocavallo defacto @@ -89,8 +89,8 @@ citetitle emphasizedwords BlockTitle blocktitle -CVS DTD +CVS valign Ashworth Bowlin @@ -114,8 +114,8 @@ luptatum TitleBlock fmt subscripted -middlename MiddleName +middlename subdirectories footnoteref manname @@ -133,8 +133,8 @@ CustomBlocks Ghostscript verear Buenos -LinuxDoc linuxdoc +LinuxDoc PostScript hhp Pretium @@ -146,8 +146,8 @@ fermentum ListingBlocks GPL hsides -Bólido Bolido +Bólido footrow misspelt WINNT @@ -159,8 +159,8 @@ bloggs hoc LiteralParagraphs primis -verbatimblock VerbatimBlock +verbatimblock shiftwidth misevaluations asciidocEmphasized @@ -183,8 +183,8 @@ docname BLAUS Daly arcu -PDFs PDF's +PDFs jim MSIE eval's @@ -420,8 +420,8 @@ WINA fringilla retab BackendBlocks -ChangeLog changelog +ChangeLog tis Ubuntu sectids @@ -439,8 +439,8 @@ Vasilev crlf vel localtime -BlockMacro blockmacro +BlockMacro Xandros groff POSIX @@ -482,8 +482,8 @@ srackham txt BlockId passthrough -Berguvsvägen Berguvsvagen +Berguvsvägen noincsearch TableRow inlinemediaobject @@ -546,8 +546,8 @@ scaledwidth cp xsl fb -DocBook docbook +DocBook stylesheet pagefile superscripted @@ -565,8 +565,8 @@ fprintf colabswidth tabsize smallnew -BlockTitles blocktitles +BlockTitles localdate bodyrow hs @@ -615,8 +615,8 @@ permalink td py AROUT -literalblock LiteralBlock +literalblock sgml biggy softtabstop @@ -631,8 +631,8 @@ tt blandit inline Martín -SectionBody sectionbody +SectionBody VM conformant listchars @@ -671,8 +671,8 @@ nbsp qanda noout massa -AsciiDoc asciidoc +AsciiDoc manmanual TableBody realpath diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt index 0979d12..1fe027d 100644 --- a/doc/asciidoc.txt +++ b/doc/asciidoc.txt @@ -2410,7 +2410,7 @@ default behavior is to strip leading and trailing blank lines within a cell. These characteristics aid readability and data entry. .Windtrainer workouts -[tablewidth="80%",cols="3,2,2,10",options="header"] +[tablewidth="80%",cols="3,.2,.2,10",options="header"] |========================================================= |Date |Duration |Avg HR |Notes @@ -2431,7 +2431,7 @@ AsciiDoc source: --------------------------------------------------------------------- .Windtrainer workouts -[tablewidth="80%",cols="3,2,2,10",options="header"] +[tablewidth="80%",cols="3,.2,.2,10",options="header"] |========================================================= |Date |Duration |Avg HR |Notes @@ -2449,66 +2449,6 @@ hard + 1min really hard taking the HR up to 160). |========================================================= --------------------------------------------------------------------- -Vertically aligned and verse style -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -[cols=",.v",valign="middle",options="header"] -|================================== -|Default alignment |Centered verses -|Per id. -|Per id. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -|Per id. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -|Per id. -|================================== - -.AsciiDoc source ---------------------------------------------------------------------- -[cols=",.v",valign="middle",options="header"] -|================================== -|Default alignment |Centered verses -|Per id. -|Per id. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -|Per id. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -|Per id. -|================================== ---------------------------------------------------------------------- - A table with externally sourced CSV data ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/examples/website/index.txt b/examples/website/index.txt index 037a061..1c6c85a 100644 --- a/examples/website/index.txt +++ b/examples/website/index.txt @@ -1,12 +1,12 @@ AsciiDoc Home Page
==================
-.New tables
+.25 August 2008: New tables
************************************************************************
AsciiDoc 'new tables' is a complete redesign of the tables syntax and
generation. It's a huge improvement over the old tables and has been
-committed to the trunk. It will appear in the next release once it's
-stabilized. link:newtables.html[Here are some new tables examples]
+committed to the trunk. It will debut officially in the next release.
+link:newtables.html[Here are some new tables examples]
************************************************************************
diff --git a/examples/website/newtables.txt b/examples/website/newtables.txt index 3d84e5e..9679587 100644 --- a/examples/website/newtables.txt +++ b/examples/website/newtables.txt @@ -2,11 +2,27 @@ AsciiDoc New tables =================== +I've finally come up with a 'new tables' syntax that I'm happy with +and can at last remove this footnote from the 'User Guide': ``The +current table syntax is overly complicated and unwieldy to edit, +hopefully a more usable syntax will appear in future versions of +AsciiDoc.'' + +At first glance it doesn't look much different to the old syntax but +it's a lot more flexible, easy to enter and supports a lot of column +styles (for example the 'asciidoc' style supports AsciiDoc block and +inline elements). + Here are some examples of AsciiDoc 'new tables'. The new tables syntax was added to the trunk in September 2008 and will appear in a future release. Adventurous sorts can grab the trunk from http://hg.sharesource.org/asciidoc/. +New tables are documented in the AsciiDoc 'User Guide' in the trunk +(`./doc/asciidoc.txt`). + +The old tables syntax has been deprecated but is currently still +processed. Simple table ------------ @@ -138,7 +154,7 @@ default behavior is to strip leading and trailing blank lines within a cell. These characteristics aid readability and data entry. .Windtrainer workouts -[tablewidth="80%",cols="3,2,2,10",options="header"] +[tablewidth="80%",cols="3,.2,.2,10",options="header"] |========================================================= |Date |Duration |Avg HR |Notes @@ -159,7 +175,7 @@ AsciiDoc source: --------------------------------------------------------------------- .Windtrainer workouts -[tablewidth="80%",cols="3,2,2,10",options="header"] +[tablewidth="80%",cols="3,.2,.2,10",options="header"] |========================================================= |Date |Duration |Avg HR |Notes @@ -177,24 +193,14 @@ hard + 1min really hard taking the HR up to 160). |========================================================= --------------------------------------------------------------------- -Vertically aligned and verse style cells ----------------------------------------- - -[cols=",.v",valign="middle",options="header"] -|================================== -|Default alignment |Centered verses -|Per id. -|Per id. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. +Default and verse styles +------------------------ -|Per id. +[cols=",.v",options="header"] +|=================================== +|Default paragraphs |Centered verses +2*|Per id. Consul *necessitatibus* per id, consetetur, eu pro everti postulant @@ -203,17 +209,14 @@ homero verear ea mea, qui. Consul *necessitatibus* per id, consetetur, eu pro everti postulant homero verear ea mea, qui. - -|Per id. -|================================== +|=================================== .AsciiDoc source --------------------------------------------------------------------- -[cols=",.v",valign="middle",options="header"] -|================================== -|Default alignment |Centered verses -|Per id. -|Per id. +[cols=",.v",options="header"] +|=================================== +|Default paragraphs |Centered verses +2*|Per id. Consul *necessitatibus* per id, consetetur, eu pro everti postulant @@ -222,19 +225,7 @@ homero verear ea mea, qui. Consul *necessitatibus* per id, consetetur, eu pro everti postulant homero verear ea mea, qui. - -|Per id. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -Consul *necessitatibus* per id, -consetetur, eu pro everti postulant -homero verear ea mea, qui. - -|Per id. -|================================== +|=================================== --------------------------------------------------------------------- @@ -344,7 +335,7 @@ mailto:joe.bloggs@foobar.com[email Joe Bloggs], joe.bloggs@foobar.com, callto:joe.bloggs[]. -'Link': See <<X1,Tables>>. +'Link': See <<X1,AsciiDoc source>>. 'Emphasized text', *Strong text*, +Monospaced text+, ``Quoted text''. @@ -356,6 +347,7 @@ Some ^super text^ and ~some sub text~ double arrow, <= left double arrow. |==================================================================== +[[X1]] .AsciiDoc source --------------------------------------------------------------------- |==================================================================== @@ -366,7 +358,7 @@ mailto:joe.bloggs@foobar.com[email Joe Bloggs], joe.bloggs@foobar.com, callto:joe.bloggs[]. -'Link': See <<X1,Tables>>. +'Link': See <<X1,AsciiDoc source>>. 'Emphasized text', *Strong text*, +Monospaced text+, ``Quoted text''. |