deplate 0.8.1 → 0.8.2

data/AUTHORS.TXT

@@ -11,7 +11,7 @@ Contributors:
       [[http://odur.let.rug.nl/~kleiweg/postscript/#conversion]]).
     Fritz Heinrichmeyer :: html-website.rb formatter, 
       htmlslides-navbar-fh module.
-    Frederik Eaton :: Suggestions concering inline latex support.
+    Frederik Eaton :: Suggestions concerning inline latex support.
     Csaba Henk :: Nested elements in lists (patch).
     Andrea Rota :: blosxom plugin, generic textpipe perl module.
     Chen Shuo :: Posted some modifications on 
@@ -19,6 +19,7 @@ Contributors:
       were the basis for several improvements.
     Lucas Wilcox :: ''dvipng'' support for rendering LaTeX snippets.
     Jeff Barczewski :: ''linkmap'' module.
+    Kelly Hunter :: Patches for the latex formatter.
 
 Credits:
     - The manual-directory contains ASCIIMathML.js by 

data/CHANGES.TXT

@@ -1,216 +1,61 @@
-This version contains an incompatible change (with respect to 0.8) 
-concerning the use of arg/ARG and xarg/XARG macros/commands.
-
 Current issues are listed in TODO.TXT.
 
-deplate 0.8.1
-	* commands.rb: The INCLUDE command takes skip, tail, and head 
-	arguments.
-	* define.rb: INCOMPATIBLE CHANGE: DefRegion and DefCommand type of 
-	regions are now passed through the template filter by default (as 
-	are other Def* regions); in order to get the old behaviour, set 
-	''legacyDefine1'' or pass a ''noTemplate'' argument to the region.
-	* regions.rb: The #Native region now takes a template! argument that 
-	makes it handle the body as a template.
-	* html.rb: Allow named keys for nextKey variable.
-	* commands.rb: XARG isn't volatile anymore. (This is due to a 
-	problem with using XARG within ''DefRegion'' that may cause a 
-	previous paragraph never to be closed/finished).
-	* latex.rb: The priority in task lists wasn't formatted as plain 
-	text.
-	* bib.rb: sep (separator from text) & mode argument (np) for the 
-	cite macro.
-	* macros.rb: The list macro inserted 'empty' in the output.
-	* latex.rb: Don't search for deplate.sty in the current directory if 
-	its the output directory. Display an error message if deplate.sty 
-	wasn't found.
-	* action_view/helpers/deplate.rb: Bug fix (thanks to skaar)
-	* commands.rb: #ARG & #XARG didn't handle array variables properly
-	* template.rb: :master wasn't propagated (did this break 
-	xmlrpc-reuse?)
-	* guesslanguage.rb: New module: guess a document's language & load 
-	the appropriate module.
-	* lang-*.rb: Renamed modules de, en, fr, ru*, zh* to lang-*. Also 
-	renamed *zh-cn* to *zh_CN* and *ru_koi* to *ru-koi*.
-	* de/en/ru*_data: Added GPL translations (de, en, ru) as language 
-	samples for the guesslanguage module.
-	* core.rb: Fixed problem with clips set in deplate.ini which were
-	processed twice (thanks to Fran�ois Lagarde).
-	* core.rb: Display an error for unrecognized lines in deplate.ini.
-	* bib.rb: cite takes an ip! argument which create citations like 
-	''NAME \(YEAR)'' -- this option automatically sets np!. If np! is 
-	set, the separator is set to ''.
-	* html-highstep.rb: New module, define a ''{step}'' macro for 
-	guiding people through a presentation etc. -- it doesn't work 
-	exaclty like this Powerpoint thing but I prefer it this way. PPT 
-	behaviour was already partly emulated before.
-	* core.rb, formatter.rb: formatter-dependent options are set in 
-	Formatter.set_options_for_file.
-	* core.rb: Make sure #with_formatter also sets formatter-dependent 
-	options like the suffix etc. to prevent major troubles with 
-	Deplate::Converter#convert_file. (Thanks to CH Swaroop for reporting 
-	this problem.)
-	* mark-external-url.rb: If markerInFrontOfURL is set, the image is 
-	placed in front of the hyperlink.
-	* code-highlight.rb: Enable for htmlsite, php*, *-snippet output.  
-	Hopefully, fixed "DBG e should be an Array. Please report." Modified 
-	command line options for highlight > 2.2.9. If the language is 
-	German, add -r to the command line arguments.
-	* code-gvim.rb: Enable for php*, html-snippet, xhtml output.
-	* core.rb, formatter.rb: formatter_family_members moved to 
-	Deplate::Formatter.
-	* core.rb, commands.rb: Abbreviations are now formatter-sensible and 
-	resetted like normal options.
-	* elements.rb: A whitespace line is a valid region delimiter.
-	* regions.rb, elements.rb, define.rb: Deprecated the use of @regNote 
-	in regions (use qualified arguments instead). This way we should 
-	sooner or later be able to smoothly unify regions and commands.  
-	Adequately named arguments will be added later on. For the moment, 
-	stick to the old (now deprecated) syntax.
-	* commands.rb: The #INCLUDE command can now set any variable for the 
-	included document.
-	* core.rb: The environment variables are accessible from within a 
-	deplate document through the env[] variable (a hash).
-	* elements.rb: Enabled the use of hashes & arrays in conditional 
-	statements. If '':'' is allowed, options now now take precedence 
-	over variables.
-	* html.rb: Support for news feed integration via the ''newsFeed'' 
-	variable.
-	* particles.rb: If ''useParentSuffix'' is set, use the source files 
-	extension when expanding wiki references as fallback strategy.
-	* formatter.rb, external.rb: Applied a patch by Lucas Wilcox for 
-	support of dvipng to render inline LaTeX snippets. (Set ''ltxSfx'' 
-	to png to make this the default.)
-	* screenplay.rb, screenplay.css: Preliminary support for writing 
-	screenplays.
-	* core.rb, input.rb: Fixed problem with using many input formats 
-	within one document. (Some input classes probably still need some 
-	plumbing.)
-	* input.rb: Catch malformed arguments (containing ! or =) that could 
-	cause the "parser" to hang.
-	* regions.rb: The #For region is by default passed through the 
-	template filter too.
-	* commands.rb: Fixed problem when temporarily setting variables with 
-	#INC.
-	* elements.rb, input.rb: If commentsShow is set, display comments in 
-	the output.
-	* elements.rb, particles.rb: Commands, regions, and macros now use 
-	arguments defined globally in the variable args@NAME[] (a hash).
-	* variables.rb: Variables with upper-case letter names cannot be set 
-	by the user.
-	* commands.rb: The #INCLUDE command sets the variable INCLUDED to 
-	the command's source file name.
-	* macros.rb: ''{nop}'' macro (a placeholder).
-	* elements.rb: FIX: exception when adding a caption with the #OPT 
-	command etc.
-	* particles.rb: FIX: Error for wiki links referring to an interwiki 
-	per se.
-	* elements.rb: Accept task lists of the form ''#A'' or ''#3'' for 
-	compatibility with vim's viki plugin.
-	* screenplay.rb: Set screenplayStyle for different section styles; 
-	currently 2 styles are known, tentatively named: hollywood (which 
-	can be used to get output similar to screenplay.tex), austria (which 
-	formats section headings like "LOCATION    AUSSEN/TAG").
-	* formatter.rb: Improved simple_bibtex_parser().
-	* macros.rb: New ''~''/''mark1st'' macros: mark a text's first 
-	occurrence, i.e. put the text in upper case letters.
-	* macros.rb: New macros: downcase, upcase, capitalize
-	* commands.rb: FIX: Problem with word abbreviations that were 
-	followed by international word characters (eg umlauts).
-	* input.rb: EXPERIMENTAL: Elements may now have a ''tag'' 
-	attribute/option (a comma-separated list). You can thus filter 
-	elements that should be included in the output by setting the 
-	''efilter'' variable (a comma-separated list). ''any'' matches any 
-	untagged element. If the variable ''styledTags'' is set, tags will 
-	automatically add style attributes (style=''TAG#{tagname}'') too.
-	* commands.rb: In order to further inconsistent naming conventions, 
-	#PROP, and #PP are now synonyms for #OPT.
-	* core.rb: Changed the way some string variables are split into a 
-	list. As a general rule, most lists now are comma-separated lists.  
-	One exception is ''KEYWORDS'', which is separated by semi-colons as 
-	many journals follow a ''major, minor'' scheme for keywords.  
-	Separators in list elements can be escaped by backslashes. For the 
-	moment, deplate tries to be smart and detect old-style separators.
-	* commands.rb: New ''#PUSH'' command, which is basically the same as 
-	''#VAR add=,: ...''.
-	* html.rb: INCOMPATIBLE CHANGE: The ''css'' variable now has to be 
-	separated by commas.
-	* input.rb: Respect tags defined in the global variable ''tag'' -- 
-	which, e.g., can be defined as argument to the ''#INCLUDE'' command 
-	what would the tag all elements included with this command with the 
-	specified tag(s).
-	* common.rb: Arguments for specific types of elements can be stored 
-	in a global hash variable.
-	E.g. ''#VAR: $ElementHeading[tag]=heading'' will tag all headings as 
-	"heading". The variable name is ''classname.split(/::/)[-2..-1].join''.
-	* macros.rb: New eprop macro. Set container element properties.
-	* input.rb: EXPERIMENTAL: The variable ''pfilter'' can be used to 
-	filter particles.
-	* core.rb: #clean_file_name (renamed to #clean_name) now returns a 
-	properly encoded filename.
-	* html.rb: FIX: Make sure the labels used in the index are properly 
-	encoded.
-	* elements.rb: The text of TODO notes (''+++'') is printed out 
-	during conversion.
-	* core.rb: "mod -MODULE" in a deplate.ini file will remove MODULE 
-	from the list of (previously) required modules.
-	* regions.rb: ''#Write file=-'' will write/print to STDOUT.
-	* messages.rb: Don't reset document encoding defined as variable.
-	* latex.rb: Define 'book', 'memoir', 'scrbook', 'report', 'scrreprt' 
-	as book classes (that use a ''\\chapter{}'' command). Users can use 
-	the bookClass variable to define additional book classes or set the 
-	variable to true.
-	* screenplay.rb: Dialog lines are automatically tagged with 
-	Name_speaks and can be filtered using the efilter variable.
-	* formatter.rb: When wrapping text, a space is added to lines that 
-	will be continued on the next line (for compatibility with vim's 
-	:set fo+=w).
-	* code-gvim71.rb: Modified version of the code-gvim module that 
-	works with newer versions of vim's 2html. (This requires hpricot to 
-	be installed.)
-	* play.rb, play.css: Renamed ''screenplay.*'' to ''play.*''.
-	* All files: Changed contact e-mail address.
-	* rdoc.rb, input.rb, template.rb: Unset input-related options in 
-	template inherited from the master object in order to make sure the 
-	input filter is template.
-	* rdoc.rb: Fixed description class.
-	* latex.rb: Clean style names.
-	* formatter.rb: Load after files for related formatters, too.
-	* messages.rb: Load messages for related formatters, too.
-	* latex-dramatist.rb: Output for the dramatist latex package (should
-	be used with the play input filter).
-	* regions.rb: Run R with ''q(runLast=FALSE)''.
-	* latex.rb: Made typeareaDIV a synonym for DIV (because upper-case 
-	variables are considered as constants).
-	* latex.rb: typeareaDIV_, DIV_ set the DIV parameter as document 
-	class option; typeareaDIV and DIV as package option
-	* core.rb: Delete excluded elements (via efilter) from listings. 
-	They are unprocessed when formatted. (This still doesn't work yet 
-	with lists though as lists are still excluded when the last item 
-	doesn't match.)
-	* linkmap.rb: New module contributed by Jeff Barczewski.
-	* particles.rb: A $ in extended wiki names sets rel=nofollow 
-	\(proposed by by Jeff Barczewski).
-	* plain.rb: List URLs only once; reuse the index if necessary.
-	* core.rb: Use level of a container's top heading not of the 
-	container itself. (In some situations, the top heading currently 
-	gets lost, though. As a result, some auto-generated index entries 
-	may get lost.)
-	* regions.txt: Renamed Deplate::Regions::Doc to 
-	Deplate::Regions::Var.
-	* regions.txt: Generic regions.
-	* core.rb, counters.rb, common.rb: When increasing a counter, save a 
-	reference to the current element.
-	* html.rb: In the index, always use the headings level.
-	* guesslanguage.rb: Guess only once.
-	* elements.rb, input.rb: When unifying elements, join tag lists. 
-	Apply efilter before unification, this solved the problem with lists 
-	that were filtered entirely when the last item didn't match.
-	* latex.rb: Escape & in hrefs.
-	* linkmap.rb: Format name as plain text; don't patch classes but
-	replace their entries in the input filter with subclasses.
-	* html.rb: cssInclude option: The contents of the CSS file will be 
-	included in the output.
+deplate 0.8.2
+	* entities-decode.rb: New module that defines &#NNN; entities.
+	* entities-encode.rb: New experimental module that encodes special 
+	characters as entities.
+	* latex.rb, core.rb: Enable page! parameter for the #MAKETITLE 
+	command for latex output (thanks Hunter Kelly)
+	* html.rb: Fixed inconsistent handling of the css option (sometimes 
+	a css suffix was required, sometimes not)
+	* latex.rb: Add unicode option to hyperref's package options if 
+	encoding is utf8 (K Hunter)
+	* core.rb (#in_working_dir): If cwd is false, don't change the 
+	directory.
+	* input.rb: The arguments of #parse() have slightly changed.
+	* commands.rb: The #CAPTION command takes an optional argument 
+	"extended!" that will case the caption to be parsed with all defined 
+	particles. Be aware though that autogenerated index markers and the 
+	like could break output. Certain other particles don't work either 
+	which is why this is disabled by default.
+	* elements.rb: #set_caption takes an extra argument to define 
+	whether the text should be parsed with the full set of rules.
+	* html.rb, format_table(): table_args() isn't call via 
+	format_particle().
+	* latex-styles.rb: The font size is set inside of the table 
+	environment (as proposed by retnuh).
+	* makefile.rb: Additional OFLAGS option (other flags).
+	* formatter.rb: @format_advice_blacklist: Disable advices for 
+	certain agents/methods.
+	* latex-styles.rb: Disable standard-processing of the style property 
+	for tables.
+	* core.rb: ''allow=all'' pseudo state, run in "unsafe" mode and 
+	allow everything.
+	* html-mathml.rb: Experimental support for mathml (requires to use 
+	xhtml11m output format; you'll have to install the mathml package by 
+	KURODA Hiraku: http://mathml.rubyforge.org).
+	* makefile: Made xhtml a "first-class" :) goal.
+	* macros.rb: The math macro takes a block! argument that makes it 
+	wrap the text in ''\\[latex\\]''.
+	* particle-math.rb: Support for ''$$formula$$'' for block formulas.
+	* xhtml11m.rb: An uninformed hack on top of xhtml10t to support 
+	mathml.
+	* makefile: xhtml now defaults to xhtml11m.
+	* code-coderay.rb: Support for the ruby syntax markup library 
+	coderay http://coderay.rubychan.de
+	* latex.rb: format_quote(): Body gets wrapped twice.
+	TBD: Check if this is a more subtle problem. See 
+	https://sourceforge.net/forum/message.php?msg_id=5041702
+	* formatter.rb: New variables ''wrapMargin'' and 
+	''wrapMarginInner''.
+	* core.rb: Some support for themes (aka collections of an ini file, 
+	css files, templates, a library, and a prelude)
+	* regions.rb: Fixed problem with R & newer version of xtable.
+	* core.rb: The rule for creating "clean" file names has slightly 
+	changed again (_ becomes __ and not _5F)
+	* elements.rb: register_heading(): use @id instead of id in order to 
+	prevent double cleansing.
+	* core.rb: Resource files for themes.
 
 
 # vim: ft=changelog:tw=72

data/NEWS.TXT

@@ -1,48 +1,25 @@
-* deplate 0.8.1
+* deplate 0.8.2
 
-This release incorporates the usual set of bugfixes, some general improvements, and support for dvipng. The way how ARG/XARG commands/macros work has changed.
+This release incorporates the usual set of bugfixes and general improvements.
 
 Incompatible changes:
-    - deplate currently is slightly instable. This is related to a change of how ARG and XARG type of commands/macros work within #Def... regions, which are now passed through the template filter. In order to retain the old behaviour, set the legacyDefine1 variable.
-    - the locale-related modules were renamed to lang-* (in some cases underscores and dashes were transposed)
-    - most lists (e.g. css variable) are now comma-separated lists
-    - many regions (e.g. #For, #Def*) are first processed by the template filter before being actually expanded
-    - The use of @regNote (the part after the colon) will be deprecated in some future version; deplate currently displays a warning message that isn't always useful/correct and should currently be ignored in certain cases
+	* Fixed inconsistent handling of the css option with regard to the suffix
 
 Improvements:
-    - dvipng support (by Lucas Wilcox)
-    - Preliminary support for writing plays (stage, screen).
-    - A whitespace line is a valid region delimiter.
-    - The {step} macro allows to stepwise highlight text on a HTML page, which could be useful for doing HTML-based presentations.
-    - #INCLUDE is much more versatile now.
-    - #Native now takes an optional template! argument so that the body gets processed by the template filter.
-    - The {cite} now knows a few extra arguments.
-    - The environment variables are accessible from within a deplate document through the env[] variable (a hash).
-    - ''$ClassName[property]'' variable to set properties for all elements of a certain class.
-    - Can filter elements or particles according to the ''tag'' property by setting the efilter and/or pfilter variables.
-    - The #INCLUDE command can set variables for the included document.
-    - A whitespace line can be a valid region delimiter
-
-New input format:
-    - play
-
-New output format:
-    - latex-dramatist
-
-New commands:
-    - #PUSH
-    - #PP, #PROP (synonyms for #OPT)
-
-New macros:
-    - mark1st, ~
-    - downcase, upcase, capitalize
-    - eprop
+    * Themes (aka collections of css files, templates etc.)
+    * Enable page! parameter for the #MAKETITLE command for latex output
+    * The #CAPTION command takes an optional argument "extended!" that 
+      will case the caption to be parsed with all defined particles.
+    * allow=all -> run in "unsafe" mode
+	* hackish support for xhtml11/mathml
+	* particle-math: Support for ''$$formula$$'' for block formulas.
 
 New modules:
-    - code-gvim71
-    - guesslanguage (guess the input document's language)
-    - html-highstep (''step'' macro)
-    - linkmap (Jeff Barczewski): markdown-like hyperlinks
+    * entities-decode.rb: support for &#NNN; entities.
+    * entities-encode.rb: Encodes special characters as entities.
+    * html-mathml.rb: Experimental support for mathml (requires the 
+      mathml package by KURODA Hiraku: http://mathml.rubyforge.org).
+	* code-coderay.rb: Support for coderay http://coderay.rubychan.de
 
 For other changes please see the CHANGES.TXT.
 

data/VERSION.TXT

@@ -1 +1 @@
-0.8.1final-2965
+0.8.2final-3103

data/etc/deplate.ini

@@ -68,6 +68,8 @@
 ;    class :: The document class; used in LaTeX (= document class) or 
 ;       HTML output (= CSS) (STRING)
 
+;    codeLineNumbers :: Display line numbers (BOOLEAN, default: false)
+
 ;    codeStyle :: The default style used for formatting code regions; 
 ;       depends on the backend (STRING)
 
@@ -227,6 +229,11 @@
 
 ;    verbatimMargin :: Wrap verbatim regions at this width (NUMBER)
 
+;    wrapMargin :: Outer wrap margin; set to 0 to prevent text wrap 
+;       (NUMBER, default: 72)
+
+;    wrapMarginInner :: Inner wrap margin (NUMBER, default: 66)
+
 
 ; *** Output Format
 ; **** HTML
@@ -425,6 +432,10 @@
 ;       the output (BOOLEAN, default: false)
 
 
+; **** entities
+;    entities :: List of entities names (COMMA-SEPARATED LIST, default: 
+;    general)
+
 ; **** html-headings-navbar
 ;    headingsNavbarMaxLevel :: Add heading up to this level to the 
 ;       navigation bar (NUMBER)

data/lib/deplate/commands.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     08-Mai-2004.
-# @Last Change: 2007-09-30.
-# @Revision:    0.1298
+# @Last Change: 2008-07-06.
+# @Revision:    0.1309
 
 # Description:
 # 
@@ -114,7 +114,7 @@ class Deplate::Command::CAP < Deplate::Command
             Deplate::Core.log("%s: %s" % [cmd, text], :debug, src)
             last = array.last
             if last
-                last.set_caption(Deplate::CaptionDef.new(text, args, src))
+                last.set_caption(Deplate::CaptionDef.new(text, args, src), false, args['extended'])
             else
                 Deplate::Core.log(["Cannot attach caption to", nil], :error, src)
             end
@@ -529,6 +529,11 @@ end
 class Deplate::Command::MAKETITLE < Deplate::Command
     register_as 'MAKETITLE'
     set_formatter :format_title
+    def setup_command
+        if @args['page']
+            @deplate.variables['classOptions'] = Deplate::Core.push_value(@deplate.variables['classOptions'], 'titlepage')
+        end
+    end
 end
 
 

data/lib/deplate/common.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     02-Aug-2004.
-# @Last Change: 2007-09-30.
-# @Revision:    0.896
+# @Last Change: 2007-12-27.
+# @Revision:    0.903
 # 
 # = Description:
 # Misc classes

data/lib/deplate/core.rb

@@ -3,7 +3,7 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     24-Feb-2004.
-# @Last Change: 2007-10-21.
+# @Last Change: 2008-07-06.
 
 require 'uri'
 require 'optparse'
@@ -26,10 +26,10 @@ module Deplate; end
 class Deplate::Core
     extend Forwardable
 
-    Version    = '0.8.1'
+    Version    = '0.8.2'
     # VersionSfx = 'a'
     VersionSfx = 'final'
-    MicroRev   = '2965'
+    MicroRev   = '3103'
 
     if ENV['HOME']
         CfgDir = File.join(ENV['HOME'].gsub(/\\/, '/'), '.deplate')
@@ -50,11 +50,13 @@ MESSAGE
     end
     LibDir     = File.dirname(__FILE__)
     DataDir    = File.join(Config::CONFIG['datadir'], 'deplate')
+    EtcDirs    = []
     # FileCache  = File.join(CfgDir, 'file_list.dat')
     FileCache  = nil
 
     # If true, don't load user configuration files.
-    @vanilla = false
+    @vanilla  = false
+    @@vanilla = false
     
     # see #log_valid_condition?
     @log_treshhold = 4
@@ -177,11 +179,11 @@ MESSAGE
                     key, val = keyval.split(/\s*=\s*/)
                     case key
                     when 'vanilla'
-                        @vanilla = true
+                        @@vanilla = @vanilla = true
                     end
                 end
             end
-            modules, formatters, csss, templates, input_defs, meta_fmts = collect_standard
+            modules, formatters, themes, csss, templates, input_defs, meta_fmts = collect_standard
             
             options = deplate_options
             opts    = OptionParser.new do |opts|
@@ -386,7 +388,7 @@ MESSAGE
                 end
                 
                 opts.on('-t', '--template NAME', String, 'Template to use') do |str|
-                    if templates.include?(str) or File.exist?(str)
+                    if @@templates.has_key?(str) or File.exist?(str)
                         log("options.template = #{@@templates[str]}")
                         options.template = str
                     else
@@ -394,10 +396,14 @@ MESSAGE
                         exit 5
                     end
                 end
-                
+               
+                opts.on('--theme THEME', String, 'Theme to use') do |value|
+                    set_theme(options, value)
+                end
+
                 opts.on('--[no-]vanilla', 'Ignore user configuration') do |bool|
                     log("options.vanilla = #{bool}")
-                    options.vanilla = bool
+                    @@vanilla = bool
                 end
 
                 opts.on('-x', '--allow-ruby [RUBY SAFE]', Integer,
@@ -419,8 +425,8 @@ MESSAGE
                     log("options.allow_external = #{bool}")
                 end
             
-                opts.separator ""
-                opts.separator "LaTeX Formatter:"
+                opts.separator ' '
+                opts.separator 'LaTeX Formatter:'
 
                 opts.on('--[no-]pdf', 'Prepare for use with pdf(la)tex') do |bool|
                     log("options.pdftex = #{bool}")
@@ -428,31 +434,37 @@ MESSAGE
                     options.variables['pdfOutput'] = true
                 end
 
-                opts.separator ''
+                opts.separator ' '
                 opts.separator 'Available input defintions:'
                 opts.separator input_defs.join(', ')
                 
-                opts.separator ''
+                opts.separator ' '
                 opts.separator 'Available formatters:'
                 opts.separator formatters.join(', ')
                 
-                opts.separator ''
+                opts.separator ' '
                 opts.separator 'Available metadata formats:'
                 opts.separator meta_fmts.join(', ')
 
-                opts.separator ''
+                opts.separator ' '
                 opts.separator 'Available modules:'
                 opts.separator modules.join(', ')
 
-                opts.separator ''
+                if themes
+                    opts.separator ' '
+                    opts.separator 'Available themes:'
+                    opts.separator themes.join(', ')
+                end
+
+                opts.separator ' '
                 opts.separator 'Available css files:'
                 opts.separator csss.join(', ')
 
-                opts.separator ''
+                opts.separator ' '
                 opts.separator 'Available templates:'
                 opts.separator templates.join(', ')
 
-                opts.separator ''
+                opts.separator ' '
                 opts.separator 'Other Options:'
 
                 opts.on('--debug [LEVEL]', Integer, 'Show debug messages') do |v|
@@ -507,10 +519,12 @@ MESSAGE
                     exit 0
                 end
             end
+            options.opts = opts
 
             @@command_line_args = args.dup
-            if options.ini_command_line_arguments
+            unless options.ini_command_line_arguments.empty?
                 args += options.ini_command_line_arguments
+                options.ini_command_line_arguments = []
             end
             options.files = opts.parse!(args)
 
@@ -567,7 +581,7 @@ MESSAGE
 
             # load general user config
             options.cfg ||= ['config.rb', CfgDir]
-            unless options.vanilla
+            unless @@vanilla
                 user_config(options, *options.cfg)
                 user_setup(options) if defined?(user_setup)
             end
@@ -600,6 +614,9 @@ MESSAGE
         # Check whether a certain action is allowed
         def is_allowed?(options, ids, args={})
             arr = options.allow
+            if arr.include?('all')
+                return true
+            end
             case ids
             when String
                 ids = Deplate::Core.split_list(ids, ',', '; ')
@@ -616,6 +633,32 @@ MESSAGE
             logger.log(['No permission', ids.join(', ')], :anyway) if logger
             return false
         end
+
+
+        def set_theme(options, name)
+            theme_dir = @@themes[name]
+            if theme_dir
+                EtcDirs.unshift(theme_dir)
+                collect_theme(@@css, theme_dir, 'css', '.css')
+                collect_theme(@@templates, theme_dir, 'templates', '')
+                for resource in Dir[File.join(theme_dir, 'resources', '*')]
+                    options.resources << [resource, false]
+                end
+                prelude = File.join(theme_dir, 'prelude.txt')
+                if File.exist?(prelude)
+                    options.prelude.concat(File.readlines(prelude).map {|l| l.chomp})
+                end
+                if is_allowed?(options, 's')
+                    read_ini_file(options, File.join(theme_dir, 'theme.ini'))
+                    unless options.ini_command_line_arguments.empty?
+                        options.opts.parse!(options.ini_command_line_arguments)
+                    end
+                end
+            else
+                log(['Unknown theme', theme], :error)
+            end
+        end
+
         
         # Read CfgDir/deplate.ini
         #
@@ -650,7 +693,6 @@ MESSAGE
                             # comment
                             next
                         elsif line =~ /^(-\S+)(\s+(.*?)\s*)?$/
-                            options.ini_command_line_arguments ||= []
                             options.ini_command_line_arguments << $1
                             options.ini_command_line_arguments << $3 if $3
                         elsif line =~ /^\s*allow\s+(.+?)\s*$/
@@ -790,7 +832,7 @@ MESSAGE
         # file:: Either a file name or a directory; if it is a 
         #   directory, all ruby files in that directory will be loaded
         def user_config(options, file, dir=nil)
-            unless options.vanilla
+            unless @@vanilla
                 if dir
                     dirs = [dir]
                     dirs << File.join(current_pwd, 'deplate.rc') if is_allowed?(options, 'r')
@@ -820,7 +862,10 @@ MESSAGE
         # inherit:: A OpenStruct; if provided, reuse it
         def deplate_options(inherit=nil)
             options               = inherit || OpenStruct.new
+            options.ini_command_line_arguments ||= []
             options.modules     ||= []
+            options.resources   ||= []
+            options.prelude     ||= []
             options.clean       ||= true
             options.force       ||= true
             options.css         ||= []
@@ -910,6 +955,7 @@ MESSAGE
                     if data['version'] == Deplate::Core.microversion
                         modules,    @@modules    = data['modules']
                         formatters, @@formatters = data['formatters']
+                        themes,     @@themes     = data['themes']
                         csss,       @@css        = data['css']
                         templates,  @@templates  = data['templates']
                         input_defs, @@input_defs = data['input']
@@ -925,6 +971,10 @@ MESSAGE
             formatters, @@formatters = collect_deplate_options('formatters','fmt')
             input_defs, @@input_defs = collect_deplate_options('input',     'input')
             meta_fmts,  @@metadata_formats = collect_deplate_options('metadata', 'metadata')
+            themes,     @@themes     = collect_deplate_options('themes', 'themes',
+                                                              :directories => true,
+                                                              :suffix => '',
+                                                              :rc => true)
             csss,       @@css        = collect_deplate_options('css',       'css', 
                                                                :suffix => '.css',
                                                                :rc => true)
@@ -938,6 +988,7 @@ MESSAGE
                         'version'    => Deplate::Core.microversion,
                         'modules'    => [modules,    @@modules],
                         'formatters' => [formatters, @@formatters],
+                        'themes'     => [themes,     @@themes],
                         'css'        => [csss,       @@css],
                         'templates'  => [templates,  @@templates],
                         'input'      => [input_defs, @@input_defs],
@@ -947,7 +998,7 @@ MESSAGE
                     Deplate::Core.log(['Create file cache', FileCache])
                 end
             end
-            return modules, formatters, csss, templates, input_defs, meta_fmts
+            return modules, formatters, themes, csss, templates, input_defs, meta_fmts
         end
 
         # This is the actual logging method. Every log message should pass 
@@ -1051,6 +1102,14 @@ MESSAGE
             end
         end
 
+        def push_value(var, value, sep=',')
+            if var and !var.empty?
+                [var, sep, value].join
+            else
+                value
+            end
+        end
+
         def escape_characters(text, args)
             esc = args[:esc] || args[:escape] || args['esc'] || args['escape'] || ''
             ebs = args[:escapebackslash] || args['escapebackslash'] || args['template'] || 0
@@ -1121,13 +1180,18 @@ MESSAGE
         # Return an encoded name
         def clean_name(text, args={})
           if text
-            replacement = args[:replacement] || '_'
-            chars       = args[:chars] || '_[:cntrl:].+*:"?<>|&\\\/'
+            chars  = args[:chars] || '[:cntrl:].+*:"?<>|&\\\/'
+            chars += replacement = args[:replacement] || '_'
             if (extrachars = args[:extra])
               chars += extrachars
             end
             text.gsub(/[#{chars}]/) do |text|
-              replacement + "%02X" % text[0]
+                case text
+                when replacement
+                    replacement * 2
+                else
+                    replacement + "%02X" % text[0]
+                end
             end
           end
         end
@@ -1153,6 +1217,15 @@ MESSAGE
             end
         end
 
+        def ensure_suffix(name, suffix)
+            ext = File.extname(name)
+            if ext != suffix
+                return name + suffix
+            else
+                return name
+            end
+        end
+
         # Return the output directory for +fname+
         def get_out_name_dir(fname, options)
             if options.recurse_hierarchy
@@ -1221,6 +1294,13 @@ MESSAGE
             end
         end
 
+        def collect_theme(hash, theme_dir, subdir, suffix)
+            for f in Dir[File.join(theme_dir, subdir, "*#{suffix}")]
+                name = File.basename(f, suffix)
+                hash[name] = f
+            end
+        end
+
         # Collect all available modules/parts/libraries etc. Check the 
         # file system and the "builtin" modules (e.g., when using the 
         # win32 exerb distribution).
@@ -1228,27 +1308,28 @@ MESSAGE
             suffix = args[:suffix] || '.rb'
             use_rc = args[:rc] || false
             hash   = {}
-            for d in library_directories(use_rc, subdir)
-                collect_deplate_options_in_hash(hash, suffix, Dir[File.join(d, '*%s' % suffix)])
+            for d in library_directories(@@vanilla, use_rc, [subdir])
+                collect_deplate_options_in_hash(hash, suffix, Dir[File.join(d, '*%s' % suffix)], nil, args)
             end
 
             builtin = "builtin_#{id}"
             if id and respond_to?(builtin)
                 files = send(builtin)
                 # files.collect! {|f| "#{f}.rb"}
-                collect_deplate_options_in_hash(hash, suffix, files, File.join('deplate', subdir))
+                collect_deplate_options_in_hash(hash, suffix, files, File.join('deplate', subdir), args)
             end
            
             return hash.keys.sort, hash
         end
 
-        # Return an array of directorys that could contain deplate 
+        # Return an array of directories that could contain deplate 
         # files.
-        def library_directories(use_rc, *subdirs)
+        def library_directories(vanilla, use_rc, subdirs)
             @library_directories ||= {}
             acc = []
             dirs = [DataDir, LibDir]
-            dirs.unshift(CfgDir) unless @vanilla
+            dirs.unshift(CfgDir) unless vanilla
+            dirs.unshift(*EtcDirs)
             dirs.unshift(File.join(current_pwd, 'deplate.rc')) if use_rc
             for subdir in subdirs
                 unless @library_directories[subdir]
@@ -1307,9 +1388,9 @@ MESSAGE
         end
 
         # Collect files in +array+ in +hash+.
-        def collect_deplate_options_in_hash(hash, suffix, array, subdir=nil)
+        def collect_deplate_options_in_hash(hash, suffix, array, subdir=nil, args={})
             for m in array
-                unless !subdir and File.directory?(m)
+                unless !subdir and !args[:directories] and File.directory?(m)
                     key = File.basename(m, suffix) || m
                     hash[key] ||= subdir ? File.join(subdir, m) : m
                     hash[key] ||= subdir ? File.join(subdir, m) : m
@@ -1477,6 +1558,8 @@ MESSAGE
     # A open structure that holds this instance's options.
     attr_reader :options
 
+    attr_reader :vanilla
+
     # The formatter this instance of deplate uses.
     attr_reader :formatter
 
@@ -1549,7 +1632,7 @@ MESSAGE
         @options      = Deplate::Core.deplate_options(args[:options])
         @sources      = args[:sources] || @options.files
         @dest         = args[:dest]    || @options.out   || ''
-        @vanilla      = args[:vanilla] || false
+        @vanilla      = @@vanilla || args[:vanilla] || false
 
         # set_safe
         
@@ -1905,9 +1988,13 @@ MESSAGE
    
     # Read input file, process, write the output if writeFile is true.
     def go(writeFile=true)
+        process_prelude
         read_file
         process_document
-        body_write if writeFile
+        if writeFile
+            body_write
+            copy_resources
+        end
         print_endmessages
     end
 
@@ -1927,13 +2014,19 @@ MESSAGE
     # Evaluate block in the working directory; take care 
     # of the auxiliaryDirSuffix variable
     def in_working_dir(cwd=nil, &block)
-        pwd   = Dir.pwd
-        cwd ||= auxiliary_dirname(true, true)
-        Dir.chdir(cwd) unless cwd.empty?
-        begin
+        pwd = Dir.pwd
+        cwd = auxiliary_dirname(true, true) if cwd.nil?
+        if cwd.empty? or cwd == false or pwd == cwd
             block.call
-        ensure
-            Dir.chdir(pwd)
+        else
+            log(['CHDIR ->', cwd], :debug)
+            Dir.chdir(cwd)
+            begin
+                block.call
+            ensure
+                log(['CHDIR <-', pwd], :debug)
+                Dir.chdir(pwd)
+            end
         end
     end
 
@@ -2024,7 +2117,7 @@ MESSAGE
             end
         end
         files << File.join(args['subdir'] || 'lib', fname)
-        files = Deplate::Core.library_directories(true, *files)
+        files = Deplate::Core.library_directories(@vanilla, true, files)
         for fn in files
             if Deplate::Core.is_file?(fn)
                 log(['File in lib', fn])
@@ -2610,6 +2703,18 @@ MESSAGE
         rv || @dest
     end
 
+   
+    def copy_resources
+        @options.resources.each do |src, anyway|
+            res  = File.basename(src)
+            dest = auxiliary_filename(res, true)
+            if anyway or !File.exist?(dest)
+                copy_file(src, dest)
+            end
+        end
+    end
+
+
     # Make sure +dir+ exists (create it if it doesn't).
     def ensure_dir_exists(dir)
         Deplate::Core.ensure_dir_exists(dir, @options)
@@ -2931,8 +3036,8 @@ MESSAGE
     end
 
     # Parse +text+ and return a formatted string.
-    def parse_and_format(container, text, alt=true, excluded=[])
-        t = parse(container, text, alt, excluded)
+    def parse_and_format(container, text, alt=true, excluded=nil)
+        t = parse(container, text, alt, :excluded => excluded)
         return format_particles(t)
     end
 
@@ -3066,6 +3171,13 @@ MESSAGE
         end
     end
 
+    def process_prelude
+        prelude = @options.prelude
+        unless prelude.empty?
+            include_stringarray(prelude, @accum_elements, nil, "[prelude]")
+        end
+    end
+
     # Read the file
     def read_file(sources=@sources)
         for f in sources