diff options
author | Stuart Rackham <srackham@methods.co.nz> | 2010-08-21 11:12:30 +1200 |
---|---|---|
committer | Stuart Rackham <srackham@methods.co.nz> | 2010-08-21 11:12:30 +1200 |
commit | bee841e4c13b886ea2f621ac7e37290fe481aefc (patch) | |
tree | 427dc10a50bc63f649872f775c31d511950d0f66 | |
parent | 14552b620315b6427211bf432af9f16ae3a8717d (diff) | |
download | asciidoc-bee841e4c13b886ea2f621ac7e37290fe481aefc.tar.gz |
- Bumped version number.
- Updated 'Publishing eBooks' webpage and CHANGELOG.
-rw-r--r-- | CHANGELOG.txt | 31 | ||||
-rwxr-xr-x | a2x.py | 2 | ||||
-rwxr-xr-x | asciidoc.py | 2 | ||||
-rw-r--r-- | common.aap | 4 | ||||
-rw-r--r-- | doc/asciidoc.dict | 56 | ||||
-rw-r--r-- | doc/publishing-ebooks-with-asciidoc.txt | 52 | ||||
-rw-r--r-- | examples/website/asciidoc-website.dict | 2 | ||||
-rw-r--r-- | examples/website/index.txt | 25 |
8 files changed, 107 insertions, 67 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7d223cb..52f579c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,37 @@ AsciiDoc ChangeLog :replacements.\bweb:: http://www.methods.co.nz/asciidoc/
+Version 8.6.1 (2010-08-22)
+--------------------------
+.Additions and changes
+- 'a2x': `--resource-dir` option renamed to `--resource`.
+- 'a2x': `--resource` option accepts both file and directory names.
+- 'a2x': Added `-m,--resource-manifest` option.
+- Added Vim syntax highlighting for quote attribute lists.
+- Load 'asciidoc.conf' from all configuration directories before any
+ other configuration files. This ensures that attributes used for
+ conditional inclusion are set before backend configuration files are
+ processed. Previously if you wanted to control global conf file
+ inclusion your only choice was to modify the global 'asciidoc.conf'
+ file.
+- AsciiDoc 'Quote element' attributes have been simplified and
+ generalized -- positional color and size attributes and named 'role'
+ attribute have been replaced by a single positional attribute.
+
+.Bug fixes
+- 'FIXED': 'asciidoctest.py': `BACKEND` command argument was being
+ ignored.
+
+Regression issues
+~~~~~~~~~~~~~~~~~
+This release breaks compatibility with quoted element positional color
+and size attributes (HTML backends). To revert to the deprecated quote
+behavior define the 'deprecated-quotes' attribute in the global
+`asciidoc.conf` file or on the command-line. For a more detailed
+explanation of the rationale behind this change see
+http://groups.google.com/group/asciidoc/browse_thread/thread/b22603bfb879418c.
+
+
Version 8.6.0 (2010-08-16)
--------------------------
.Additions and changes
@@ -21,7 +21,7 @@ import urlparse import zipfile PROG = os.path.basename(os.path.splitext(__file__)[0]) -VERSION = '8.6.0' +VERSION = '8.6.1' # AsciiDoc global configuration file directory. # NOTE: CONF_DIR is "fixed up" by Makefile -- don't rename or change syntax. diff --git a/asciidoc.py b/asciidoc.py index 918d3ff..9742b71 100755 --- a/asciidoc.py +++ b/asciidoc.py @@ -9,7 +9,7 @@ under the terms of the GNU General Public License (GPL). import sys, os, re, time, traceback, tempfile, subprocess, codecs, locale ### Used by asciidocapi.py ### -VERSION = '8.6.0' # See CHANGLOG file for version history. +VERSION = '8.6.1' # See CHANGLOG file for version history. MIN_PYTHON_VERSION = 2.4 # Require this version of Python or better. @@ -2,8 +2,8 @@ # Executed by all main.aap's before anything else. # -_parent.VERS = 8.6.0 -_parent.DATE = 16 August 2010 +_parent.VERS = 8.6.1 +_parent.DATE = 22 August 2010 all: :pass diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict index f7ba543..9226464 100644 --- a/doc/asciidoc.dict +++ b/doc/asciidoc.dict @@ -4,8 +4,8 @@ colspecs API testcases BSBEV -dblatex dapibus +dblatex attributelist AttributeList Blondel @@ -32,8 +32,8 @@ BOM Bon ungenerated zipP -des cmd +des ListItems dev vulputate @@ -116,8 +116,8 @@ xreflabel PDF's PDFs pygmentize -MSIE pede +MSIE permalinks Boscombe Daly @@ -131,8 +131,8 @@ apos ShareSource projectname hoc -ispum Maier +ispum TableFooter blog passthroughs @@ -188,8 +188,8 @@ optionname sollicitudin companyname pageunits -nec loc +nec latexmath articleinfo auctor @@ -218,12 +218,12 @@ endDocument odt Cygwin ultrices -indentedparagraph IndentedParagraph +indentedparagraph ltr doctests -AsciiDocAPI asciidocapi +AsciiDocAPI itemtag Dvips Jython @@ -260,9 +260,9 @@ lobortis Broberg Bowlin navPoint -asciimathml -AsciiMathML ASCIIMathML +AsciiMathML +asciimathml conf RCS CalloutList @@ -313,8 +313,8 @@ pgwide RevisionDate crlf tex -Bólido Bolido +Bólido tabsize colpcwidth Orry @@ -330,8 +330,8 @@ Tsawassen Aenean postsubs src -LastName lastname +LastName toc tmp Knisley @@ -382,8 +382,8 @@ undefines Andrés yellowback Quisque -htmlhelp HTMLHelp +htmlhelp cellspacing Citeaux srackham @@ -396,9 +396,9 @@ headrow Morbi Blauer footdata -al -bg cb +bg +al cd xsl backmatter @@ -415,16 +415,16 @@ fb fermentum fi cellcount -et fo +et eu hg guimenu fugiat toclevels xzf -gq JB +gq refactored sgml backcolor @@ -441,14 +441,14 @@ lf defacto mb IndentedBlocks -md js +md erat blogpost xsltproc jw -ln nd +ln ne oa Terje @@ -470,8 +470,8 @@ ps runtime tcqn epub -px td +px vivamus py addon @@ -487,8 +487,8 @@ tt VM Frédérique SidebarBlock -wj ut +wj Efros param Movet @@ -693,8 +693,8 @@ pagebreak VariableList LiteralBlocks Donec -BLONP dbook +BLONP asciimath interesset pellentesque @@ -772,8 +772,8 @@ basebackend urna rowsep checksums -BlockMacro blockmacro +BlockMacro mailto http pychart @@ -815,16 +815,16 @@ startDocument ifdef manmanual Konqueror -FirstName firstname -LaTeXMathML +FirstName latexmathml +LaTeXMathML sectnum BlockMacros cceeff unfloat -snabbköp snabbkop +snabbköp NumberedList everti multi @@ -894,8 +894,8 @@ cellpadding entrytbl Ornare authorinitials -javascripts JavaScripts +javascripts undefining leveloffset CustomBlock @@ -951,8 +951,8 @@ Redhat datadir Kumar IndentedParagraphs -Berguvsvagen Berguvsvägen +Berguvsvagen executables tabledef ftdetect @@ -973,6 +973,6 @@ lectus JavaHelp unescaped mydoc -middlename MiddleName +middlename Jimmac's diff --git a/doc/publishing-ebooks-with-asciidoc.txt b/doc/publishing-ebooks-with-asciidoc.txt index a20e4e4..35a879a 100644 --- a/doc/publishing-ebooks-with-asciidoc.txt +++ b/doc/publishing-ebooks-with-asciidoc.txt @@ -13,15 +13,20 @@ Publishing eBooks with AsciiDoc It's easy to write and publish books in http://en.wikipedia.org/wiki/EPUB[EPUB] and PDF formats using -http://www.methods.co.nz/asciidoc/[AsciiDoc]. Here are three examples: -The first is a minimal example introducing the AsciiDoc format, the -second ('The Brothers Karamazov') is a rather long multi-part book and -the third ('The Adventures of Sherlock Holmes') includes a front cover -image and fully customized styling. +http://www.methods.co.nz/asciidoc/[AsciiDoc]. + +Here are three examples: The first is a minimal example introducing +the AsciiDoc format, the second ('The Brothers Karamazov') is a rather +long multi-part book and the third ('The Adventures of Sherlock +Holmes') includes a front cover image and customized page styling. // Wordpress processing instruction. pass::[<!--more-->] +The examples presented below were created on a PC running Xubuntu +Linux 10.04 but should be applicable to any UNIX-based operating +system. + == Minimal Book This didactic example contains a title and two chapters. The AsciiDoc @@ -59,8 +64,8 @@ version (`minimal-book.pdf`) with 'dblatex' run: a2x -fpdf -dbook minimal-book.txt -The example PDFs referenced on this page were built using FOP -- if -you prefer http://xmlgraphics.apache.org/fop/[FOP] over +The distributed example PDFs were built using FOP -- if you prefer +http://xmlgraphics.apache.org/fop/[FOP] over http://dblatex.sourceforge.net/[dblatex] use: a2x -fpdf -dbook --fop minimal-book.txt @@ -195,12 +200,6 @@ this command: a2x adventures-of-sherlock-holmes.txt -Here's a screenshot of the first page of the fist chapter (rendered by -the https://addons.mozilla.org/en-US/firefox/addon/45281/[Firefox -PUBReader addon]): - -image::images/epub.png[] - [frame="topbot",options="header",caption=""] .Sherlock Holmes source files and eBooks |==================================================================== @@ -215,6 +214,12 @@ image::images/epub.png[] |==================================================================== +Here's a screenshot of the first page of the first chapter (rendered by +the https://addons.mozilla.org/en-US/firefox/addon/45281/[Firefox +PUBReader addon]): + +image::images/epub.png[] + The {examples-url}adventures-of-sherlock-holmes.zip[AsciiDoc source Zip file] contains the following files: @@ -228,17 +233,21 @@ Zip file] contains the following files: `adventures-of-sherlock-holmes-docinfo.xml`:: A http://www.methods.co.nz/asciidoc/userguide.html#X87[docinfo] file - containing DocBook markup for the front cover image and Project + containing DocBook markup for the front cover image and the Project Gutenberg frontmatter. DocBook XSL Stylesheets identifies the book cover image by the `role="cover"` attribute in the DocBook `mediaobject` element. `adventures-of-sherlock-holmes.css`:: CSS rules for styling the page layout. The design is based on the - http://epubzengarden.com[ePub Zen Garden] 'Gbs' style. + http://epubzengarden.com[ePub Zen Garden] 'Gbs' style. Because this + file is not named `docbook-xsl.css` the name must be specified + explicitly using the 'a2x' `--stylesheet` option. `underline.png`:: - A title underline image that is used by the CSS stylesheet. + A title underline image that is used by the CSS stylesheet. This + resource has to be explicitly passed to 'a2x' because 'a2x' only + searches HTML files for resources. Here's the start of the AsciiDoc source file showing the AsciiDoc specific meta-data: @@ -259,7 +268,7 @@ specific meta-data: // a2x: "--stringparam part.autolabel 0 // a2x: --stringparam chapter.autolabel 0 // a2x: --stringparam section.autolabel.max.depth 0" -// Added external resources. +// Additional resources. // a2x: --resource underline.png // @@ -303,9 +312,10 @@ Styling your books You can customize the appearance of a document by creating your own CSS file. Either create your own or copy and edit the existing default `docbook-xsl.css` file (located in the AsciiDoc `stylesheets` -configuration directory) to the same directory as your AsciiDoc source -file. Use the 'a2x' `--stylesheet` option if you prefer to use a -different stylesheet file name. +configuration directory) then place it in the same directory as your +AsciiDoc source file. Use the 'a2x' `--stylesheet` option if you +prefer to use a different stylesheet file name and/or location. Take +a look at the `adventures-of-sherlock-holmes.css` CSS file. There are some great examples of EPUB book styles at http://epubzengarden.com/[ePub Zen Garden]. @@ -321,5 +331,3 @@ natively. As of writing this article most eBook readers (with the notable exception of Amazon's Kindle) support the EPUB format. - - diff --git a/examples/website/asciidoc-website.dict b/examples/website/asciidoc-website.dict index 8a2df5d..ce8c301 100644 --- a/examples/website/asciidoc-website.dict +++ b/examples/website/asciidoc-website.dict @@ -66,8 +66,8 @@ matplotlib stdout usr txt -ebooks eBooks +ebooks linenumbering ImageMagick distros diff --git a/examples/website/index.txt b/examples/website/index.txt index c15414d..f746e6d 100644 --- a/examples/website/index.txt +++ b/examples/website/index.txt @@ -3,10 +3,12 @@ AsciiDoc Home Page .{revdate}: AsciiDoc {revnumber} Released
************************************************************************
-This release contains over forty improvements and some bug fixes. A
-number of the enhancements have been designed to make
+This release follows hard on the heels of 8.6.0, it includes a couple
+'a2x' enhancements. In addition the AsciiDoc 'Quote element'
+attributes have been simplified and generalized (this change is not
+backward compatible). The
link:publishing-ebooks-with-asciidoc.html[publishing eBooks with
-AsciiDoc] easy.
+AsciiDoc] webpage has also been updated.
Read the link:CHANGELOG.html[CHANGELOG] for a full list of all
additions, changes and bug fixes. Changes are documented in the
@@ -165,13 +167,14 @@ Editor Support --------------
- An AsciiDoc syntax highlighter for the Vim text editor is included in the
AsciiDoc distribution (see 'Appendix F' of the 'AsciiDoc User Guide' for
-details).
+ details).
+
.Syntax highlighter screenshot
image::images/highlighter.png[height=250,caption="",link="images/highlighter.png"]
-- Dag Wieers has implemented an alternative Vim syntax file for AsciiDoc which
- can be found here http://svn.rpmforge.net/svn/trunk/tools/asciidoc-vim/.
+- Dag Wieers has implemented an alternative Vim syntax file for
+ AsciiDoc which can be found here
+ http://svn.rpmforge.net/svn/trunk/tools/asciidoc-vim/.
- David Avsajanishvili has written a source highlighter for AsciiDoc
files for http://projects.gnome.org/gtksourceview/[GtkSourceView]
(used by http://projects.gnome.org/gedit/[gedit] and a number of
@@ -179,12 +182,10 @@ image::images/highlighter.png[height=250,caption="",link="images/highlighter.png https://launchpad.net/asciidoc-gtk-highlight
- Florian Kaufman has written
http://code.google.com/p/sensorflo-emacs/source/browse/trunk/adoc-mode.el[adoc-mode.el]
--- a major-mode for editing asciidoc files in Emacs.
-- Sun Tong has written an http://xpt.sourceforge.net/tools/doc-mode/[Emacs mode
- for AsciiDoc fontlocking].
-- The http://xpt.sourceforge.net/[*Nix Power Tools project] has released an
- http://xpt.sourceforge.net/tools/doc-mode/[AsciiDoc syntax highlighter for
- Emacs].
+ -- a major-mode for editing asciidoc files in Emacs.
+- The http://xpt.sourceforge.net/[*Nix Power Tools project] has
+ released an http://xpt.sourceforge.net/tools/doc-mode/[AsciiDoc
+ syntax highlighter for Emacs].
- Terrence Brannon has written
http://github.com/metaperl/asciidoc-el[AsciiDoc functions for
Emacs].
|