RubyGems - docgenerator - Versions diffs - 1.1.1 → 1.2.1 - Mend

docgenerator 1.1.1 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (179) hide show

data/examples/results_expected/docgenerator_example_tabular.pdf ADDED Viewed

Binary file

data/examples/results_expected/docgenerator_example_tabular.tex ADDED Viewed

@@ -0,0 +1,41 @@
+%
+%	Build by	C:/appl/Ruby192/lib/ruby/gems/1.9.1/gems/docgenerator-1.2.1/lib/docgenerator/document.rb
+%	Dir:		C:/usr/script/documentgenerator/examples/results
+%	Creator:	docgenerator_example_tabular.rb
+%	Target:		docgenerator_example_tabular.tex
+%	2011/02/18 10:44:08
+%
+%	Generation-Info-End
+\documentclass[ngerman]{scrartcl}
+\usepackage{babel}
+\usepackage[ansinew]{inputenc}
+\usepackage{hyperref}
+% ----------------------------------------------------------------
+\title{Testdocument with tabulars}
+\hypersetup{pdftitle={Testdocument with tabulars}}
+% ----------------------------------------------------------------
+\begin{document}
+\maketitle \section{Tabulars}
+\begin{tabular}{cccc}
+\multicolumn{4}{c}{Title}\\[1ex]\hline
+1A & 1B & 1C & 1D\\
+2A & 2B & 2C & 2D\\
+3A & 3B & 3C & 3D\\
+4A & 4B & 4C & 4D\\
+5A & 5B & 5C & 5D\\
+\end{tabular}
+\begin{tabular}{cccccc}
+\multicolumn{6}{c}{Title}\\[1ex]\hline
+1A & 1B & 1C & 1D & 1E & 1F\\
+2A & 2B & 2C & 2D & 2E & 2F\\
+3A & 3B & 3C & 3D & 3E & 3F\\
+4A & 4B & 4C & 4D & 4E & 4F\\
+5A & 5B & 5C & 5D & 5E & 5F\\
+\end{tabular}
+\end{document}
+% ----------------------------------------------------------------

data/examples/results_expected/docgenerator_example_tripfalls.html ADDED Viewed

@@ -0,0 +1,27 @@
+<!--
+	Build by	C:/usr/script/documentgenerator/lib/docgenerator/document.rb
+	Dir:		C:/usr/script/documentgenerator/examples/results
+	Creator:	docgenerator_example_tripfalls.rb
+	Target:		docgenerator_example_tripfalls.html
+	2011/02/18 11:23:23
+	Generation-Info-End
+-->
+<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head >
+<title>Testdocument with tripfalls</title>
+</head>
+<body lang = "de" ><!-- maketitle -->
+<h1 >Generell Tripfalls</h1>
+Some Text<br />
+Some Text<h1 >Tripfalls with HTML</h1>
+<h2 >Paragraph forgotten?</h2>
+You may add text to the body direct.
+But there is no p-tag in HTML if you don't define it.
+Your HTML will be malformed and when you use CSS, you may loose your layout for paragraphs.
+<h1 >Tripfalls with LaTeX</h1>
+<h2 >Tabulars</h2>
+</body>
+</html>

data/examples/results_expected/docgenerator_example_tripfalls.pdf ADDED Viewed

Binary file

data/examples/results_expected/docgenerator_example_tripfalls.tex ADDED Viewed

@@ -0,0 +1,31 @@
+%
+%	Build by	C:/usr/script/documentgenerator/lib/docgenerator/document.rb
+%	Dir:		C:/usr/script/documentgenerator/examples/results
+%	Creator:	docgenerator_example_tripfalls.rb
+%	Target:		docgenerator_example_tripfalls.tex
+%	2011/02/18 11:23:23
+%
+%	Generation-Info-End
+\documentclass[ngerman]{scrartcl}
+\usepackage{babel}
+\usepackage[ansinew]{inputenc}
+\usepackage{hyperref}
+% ----------------------------------------------------------------
+\title{Testdocument with tripfalls}
+\hypersetup{pdftitle={Testdocument with tripfalls}}
+% ----------------------------------------------------------------
+\begin{document}
+\maketitle \section{Generell Tripfalls}
+Some Text\newline
+Some Text\section{Tripfalls with HTML}
+\subsection{Paragraph forgotten?}
+You may add text to the body direct.
+But there is no p-tag in HTML if you don't define it.
+Your HTML will be malformed and when you use CSS, you may loose your layout for paragraphs.
+\section{Tripfalls with LaTeX}
+\subsection{Tabulars}
+\end{document}
+% ----------------------------------------------------------------

data/lib/creole/creole2doc.rb CHANGED Viewed

@@ -1,24 +1,35 @@
-#
-#This is a Creole-to-Docgenerator converter.
-#The Docgenerator-data can be exported as
-#- HTML
-#- LaTeX
-#- Creole
-#- Wikimedia-like wiki
-#- Plain text
-#
-#For another Creole-to-XHTML converter see
-#https://rubyforge.org/projects/wikicreole/
-#
-#More about creole at http://www.wikicreole.org/
-#
+# encoding: utf-8
+=begin rdoc
+This is a Creole-to-Docgenerator converter.
+The Docgenerator-data can be exported as
+- HTML
+- LaTeX
+- Creole
+- Wikimedia-like wiki
+- Plain text
+For another Creole-to-XHTML converter see
+https://rubyforge.org/projects/wikicreole/
+More about creole at http://www.wikicreole.org/
+=end
+class Creole
+  VERSION = '1.2.1'
+end
+#~ $:.unshift("../") #for test purposes.
+#Load the same version of docgenerator
 require 'docgenerator'
+if Creole::VERSION != Docgenerator::VERSION
+  raise LoadError, "Creole V#{Creole::VERSION} needs Docgenerator #{Creole::VERSION}, but gets #{Docgenerator::VERSION}"
+end
-#
-#Some class definitions for the Creole-class.
-#
+=begin rdoc
+Some class definitions for the Creole-class.
+=end
 class Creole
   #Little structure to store the parsing result.
   Creole_line = Struct.new('Creole_line', :type, :content, :add_info)
   #Define Placeholders
@@ -44,10 +55,18 @@ class Creole
     '<-' => element(:leftarrow),
     '<=' => element(:Leftarrow),
     '_' => element(:underscore),
-    #~ '...' => element(:ldots),  . maskieren?
+    '…' => element(:ldots),
+    '‚' => element(:sbquo),   #	einfaches low-9-Zeichen, U+201A , &#8218;
+    '’' => element(:rsquo),   #'zu &#8217;
+    '„' => element(:bdquo),   #"auf  &#8222;
+    '“' => element(:ldquo),    #"zu 	&#8220;
+    '–' => element(:ndash),  #	&#8211;
+    '—' => element(:mdash),  #	&#8211;
   }
-  #Add a quick online-help.
+=begin rdoc
+Add a quick online-help.
+=end
   def self.help( option = :syntax)
     hlp = []
     hlp << "==Creole help #{option}"
@@ -141,43 +160,43 @@ tabular
 end #Creole
 #Load sub-classes.
-Dir.chdir(File.dirname(__FILE__)){
-require 'creole_placeholder.rb'
-require 'creole_tabular.rb'
-require 'creole_inclusion_and_plugins.rb'
-#~ begin require '../../privat/creole_privat.rb'; rescue LoadError; end #fixme
-begin require 'creole_privat.rb'; rescue LoadError; end #Just some privat extension
-}
-Dir.chdir('..'){
-  require 'docgenerator'
-}
+#~ Dir.chdir(File.dirname(__FILE__)){
+require_relative 'creole_placeholder.rb'
+require_relative 'creole_tabular.rb'
+require_relative 'creole_inclusion_and_plugins.rb'
+begin require 'privat/creole_affiliate.rb'; rescue LoadError; end #Just some privat extension
 require 'log4r'
-#
-#Build a document.
-#This is just a little combination of the classes Document and Creole.
-#
-#For the future: This class could allow features t build one TeX-file and
-#multiple HTML (corresponding to pages).
-#
-#HTML-pagebreak could be forced with ======== or something similar.
+=begin rdoc
+Build a document.
+This is just a little combination of the classes Document and Creole.
+For the future: This class could allow features t build one TeX-file and
+multiple HTML (corresponding to pages).
+HTML-pagebreak could be forced with ======== or something similar.
+=end
 class Creole_document
-  #Define a creole document. The settings are forwarded to Document#new()
-  #
-  #Some settings are used only directly in Creole_document.
-  #- :with_toc: Add a table of contents at the beginning of the document.
-  #- :content: Wiki-text. Same as Creole_document#<<
+  include Docgenerator  #get VERSION
+=begin rdoc
+Define a creole document. The settings are forwarded to Document#new()
+Some settings are used only directly in Creole_document.
+- :with_toc: Add a table of contents at the beginning of the document.
+- :content: Wiki-text. Same as Creole_document#<<
+=end
   def initialize( settings = {} )
     @with_toc  = settings[:with_toc ]
     settings.delete(:with_toc)  #Avoid error message in Document.new
     @creole = Creole.new(
         #Get content if available and delete setting to avoid error message in Document.new
         :content  => settings.delete(:content),
+        :ignore     => settings.delete(:ignore),
         :targetdir => settings.delete(:targetdir)
     )
     #fixme/ideen parameter
     #preamble -> vor wiki-texten
     #post -> nach wiki-texten
@@ -185,6 +204,9 @@ class Creole_document
     #replacements (schon teil von document?)
     @doc = Document.new(settings)
+    @doc.runtex = settings[:runtex] if settings[:runtex]
     @log  = @doc.log
     @doc.body << creole
@@ -198,12 +220,22 @@ class Creole_document
   def << (content)
     @creole << content
   end
-  #Save the creole document
+=begin rdoc
+Save the creole document.
+If requested, the tableofcontents is added.
+The first Creole_document#save decides, which variant is added (html/tex)
+=end
   def save( filename, options = {} )
-    if @with_toc
-      @doc.body.insertbefore(creole, creole.toc)
-      @with_toc  = false #Add it only once
-    end
+    if @with_toc
+        @doc.body.insertbefore(creole, element(:htmlonly,{}, creole.toc(:level => @with_toc )))
+        @doc.body.insertbefore(creole, element(:latexonly,{},element(:tableofcontents).cr))
+        case @with_toc
+          when Numeric
+            @doc.head << element(:latexonly,{},"\\setcounter{tocdepth}{#{@with_toc}}\n")
+          end
+        @with_toc  = false #Add it only once
+    end #@with_toc
     @doc.save(filename, options )
   end
@@ -212,31 +244,47 @@ class Creole_document
     @doc.runtex = option
   end
 end
-#Creole is a standard wiki-syntax for wikitexts.
-#Definition see http://www.wikicreole.org
-#
-#I liked this definition.
-#When you look at the website, you get a definition and
-#you get an explanation, why it is like this. - great!
-#
-#This class gets a creole-text and translate it to elements of the docgenerator,
-#they can be used by Document or directly like Element#to_doc.
-#
-#Example:
-# wiki = Creole.new()
-# wiki << <<txt
-# =Test document
-# This is a little test text with **bold** and //italic// text.
-# txt
-# puts wiki.to_latex()
+=begin rdoc
+Creole is a standard wiki-syntax for wikitexts.
+Definition see http://www.wikicreole.org
+I liked this definition.
+When you look at the website, you get a definition and
+you get an explanation, why it is like this. - great!
+This class gets a creole-text and translate it to elements of the docgenerator,
+they can be used by Document or directly like Element#to_doc.
+Example:
+ wiki = Creole.new()
+ wiki << <<txt
+ =Test document
+ This is a little test text with **bold** and //italic// text.
+ txt
+ puts wiki.to_latex()
+Often I use it in combination with "Here"-Documents with __END__:
+ require 'creole/creole2doc'
+ doc = Creole_document.new()
+ doc << DATA
+ doc.save('test.html')
+ __END__
+ Content
+=end
 class Creole
-  #Define the Creole-object.
-  #
-  #Options:
-  #- :log => Logger to catch information.
-  #   Alternativ you have access to the default logger via Creole#log
-  #- :targetdir => directory, where you want to save the result.
-  #   This directory is important for checks for internal links.
+=begin rdoc
+Define the Creole-object.
+Options:
+- :log => Logger to catch information.
+   Alternativ you have access to the default logger via Creole#log
+- :targetdir => directory, where you want to save the result.
+   This directory is important for checks for internal links.
+- :ignore: A regex describing parts to be ignored during text parsing. e.g. /^#~.*$/ for usage with scite.
+- :encoding: The encoding used for creole.
+  Default is UTF-8
+=end
   def initialize( options = {} )
     @options = {
       :name => 'Creole',  #Just a name for easier debugging/logging
@@ -254,6 +302,8 @@ class Creole
         5 => :h5,
         6 => :h6,
       },
+      :ignore => nil, #Define a "local" comment, e.g /^#~.*$/
+      :encoding => __ENCODING__,
     }.update(options)
     @placeholders = Placeholders.dup
     @inclusions     = Inclusions.dup
@@ -267,11 +317,11 @@ class Creole
     @footnotegroups = {}  #Collection of footnote groups
-    @targetdir  = @options[:targetdir]
+    @targetdir  = @options[:targetdir] if @options[:targetdir]
     @log  = @options[:log]
     @log = Log4r::Logger.new(@options[:name], Log4r::INFO) unless @log
     @log.outputters = Log4r::StdoutOutputter.new('log_stdout') if  @log.outputters.empty?
     self  <<  @options[:content]  if @options[:content]
   end
@@ -294,18 +344,28 @@ class Creole
   #All footnotegroups of the wiki
   attr_reader :footnotegroups
-  #Get some content.
-  #Strings are taken like strings.
-  #
-  #It is possible to add the content of a file. Just add the open file handle.
-  #In case of ruby scripts, the part after __END__ is used as input.
-  #
-  #Content added with << starts always with a new paragraph, but it may contain
-  #multiple paragraphs, lists...
+  #Error Class
+  class InputError < ArgumentError; end
+=begin rdoc
+Get some content.
+Strings are taken like strings.
+Array items are handled like lines.
+It is possible to add the content of a file. Just add the open file handle.
+In case of ruby scripts, the part after __END__ is used as input.
+Content added with << starts always with a new paragraph, but it may contain
+multiple paragraphs, lists...
+=end
   def << ( input )
-    if input.is_a?(String)
+    case input
+      when String
       source = input
-    elsif input.is_a?(File)
+    when Array
+      #Items of the array are handled like single lines.
+      #The chomp avoid double \n (the array items may already have their own newlines).
+      source = input.map{|item| item.chomp}.join("\n")  #ohne doppelte xx
+    when File
       #If file is a ruby script, then use the wiki-code after __END__
       #
       #Often scripts contains there own text content after __END__.
@@ -319,24 +379,40 @@ class Creole
         end
       end
       #Read the code
-      source = input.readlines.to_s
+      source = input.readlines.join
+    else
+      raise InputError, "Don't know, how to handle #{input.class} in Creole#<<"
     end
-    @source << source
+    source_enc = source.encode(@options[:encoding])
+    @source << source_enc
     #Parse the given source.
     #This is done immediate, so you have a chance to localize the line, where an error occurs.
     #(Some errors are reported later during to_doc).
-    #fixme: optional sofort bei << oder sp�ter.
+    #fixme: option to parse immediate at << or later
     #immediate_parse => true...
-    @normsource.push( *parse( source ) )
+    @normsource.push( *parse( source_enc  ) )
   end #<< ( input )
-  #Parse the given creole code and build a "normalized source"
+=begin rdoc
+Parse the given creole code and build a "normalized source"
+=end
   def parse( source = @source )
-    normsource = []
+    normsource = []
     statusflag = nil  #Variable to store the actual status. nil = nothing special.
     normsource << Creole_line.new(:dummy)
+    if ! source.respond_to?(:each_with_index)
+      #Ruby 1.9 removed each from String
+      if source.respond_to? :each_line
+        source = source.each_line
+      else
+        @log.fatal("Unable to parse #{source.class}: #{source.inspect}" ) if @log.fatal?
+        return normsource
+      end
+    end
     #
     #Check code line by line
     #
@@ -362,6 +438,14 @@ class Creole
       #
       #Parse the wiki text on line level (main structure)
       case line
+        #Skip this line, if it correspond to a special comment-pattern.
+        #Can be used for application-specific comments.
+        #
+        #Example:
+        #   :ignore => /^#~.*$/
+        #This comment is created by scite using Ctrl-Q (for ruby-scripts).
+        when @options[:ignore]
+            @log.info("Found comment #{$1} : #{line.inspect}" ) if @log.info?
         #Headings
         #http://www.wikicreole.org/wiki/Headings
         #
@@ -376,6 +460,9 @@ class Creole
           if $~.post_match !~ /\s*/
             @log.warn("Ignore text #{$~.post_match.inspect} after title  <#{line.inspect}>" ) if @log.warn?
           end
+          #And close the actual level
+          #See unit test test_creole_mix_titles_list
+          normsource << Creole_line.new(:dummy )
         #Empty line
         when /^\s*$/
           normsource << Creole_line.new(:dummy )
@@ -395,14 +482,15 @@ class Creole
                                       ) unless normsource.last.content.is_a?(Creole_creoletab)
           normsource.last.content << line
         #http://www.wikicreole.org/wiki/PreformattedAndNowiki
-        when /^\{\{\{\s*$/
+        when /^\{\{\{\s*$/  #Kind of verbatim
           normsource << Creole_line.new(:pre, [], :start => lineno )
           statusflag = :pre
-        #~ when /^<<<(.*)\|?(.*?)/ #fixme optionen f�r placeholder?
+        #~ when /^<<<(.*)\|?(.*?)/ #fixme options for placeholders?
         when /^<<<(.*)/
-          placeholder = @placeholders[$1].new(self)
+          ph, par = $1.split(/\|/,2)
+          placeholder = @placeholders[ph].new(self, par)
           if placeholder.is_a?(Creole_dummy_placeholder)
-            @log.warn("Unknown placeholder #{$1.inspect} used in line #{lineno}" ) if @log.warn?
+            @log.warn("Unknown placeholder #{ph.inspect} used in line #{lineno}" ) if @log.warn?
           end
           normsource << Creole_line.new(:placeholder, placeholder, :start => lineno )
           statusflag = :placeholder
@@ -440,15 +528,22 @@ class Creole
   #See http://forum.ruby-portal.de/viewtopic.php?t=3844
   #
-  #
-  #Return a table of contents.
-  #
+=begin rdoc
+Return a table of contents as a list
+=end
   def toc( i_options = {})
     options = {
       :listtype  => :ul,
       :level    => 4,
       #~ :startlevel  => 1,
       }.update(i_options)
+    if ! options[:level].is_a?(Fixnum)
+      @log.error("Toc: toclevel is no number but '#{options[:level].inspect}'. Set 4") if @log.error?
+      options[:level] = 4
+    end
     toclist = []
     toclabel = [0] #help variable to construct labels
     listtype = '*'
@@ -463,7 +558,13 @@ class Creole
     @toc.each{|tocentry|
         level = tocentry.add_info[:level]
+#
+#fixme:
+#Ebenenfehler (fehlende ebene resultiert in:
+# ERROR Creole: List ** with missing sublist
+# --> bessere meldung
         #Build the label
         if level > toclabel.size
           toclabel << 0
@@ -490,16 +591,30 @@ class Creole
         toclist << "#{listtype * level}[[##{label}|#{tocentry.content}]]"
       }
-    return Creole.new( :content => toclist.join("\n") )
+      toclist = <<toc
+<<<html
+<div class = 'toc'>
+>>>
+#{toclist.join("\n")}
+<<<html
+</div>
+>>>
+toc
+    return Creole.new( :content => toclist, :log => @log )
   end #toc
-  #Don't do anything, if line_width is 0.
+=begin rdoc
+Wrapping mechanism for texts.
+Don't do anything, if line_width is 0.
+=end
   def word_wrap(text, line_width = @options[:wrap_at] )
     return text if line_width <= 0
     text.gsub(/\n/, ' ').gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip
   end
-  #
-  #Prepare document.
+=begin rdoc
+Prepare document.
+=end
   def to_doc( target, options = {} )
     options[:log] = @log unless options[:log]
     #
@@ -508,10 +623,12 @@ class Creole
     @footnotegroups = {}  #Collection of footnote groups
     return normsource2elements( @normsource, options ).to_doc(target, options)
   end #to_doc
-  #Take the given normsource and build a list of elements.
-  #Used by
-  #- Creole#to_doc
-  #-  Creole_ruby#to_doc
+=begin rdoc
+Take the given normsource and build a list of elements.
+Used by
+- Creole#to_doc
+-  Creole_ruby#to_doc
+=end
   def normsource2elements( normsource, options )
     doc = []
     elements = {} #little collector for lists
@@ -560,7 +677,7 @@ class Creole
             end
           }
       when :pre
-        doc << element(:pre, {}, line.content ).cR
+        doc << element(:verbatim, {}, line.content ).cR
       when :hr
         doc << element(:hr).cr
       when :placeholder
@@ -574,25 +691,34 @@ class Creole
     return doc
   end #to_doc_internal
-  #
-  #Parse the inline text.
-  def inline( text,  options )
+=begin rdoc
+Parse the inline text.
+Options is a Hash and may contain:
+* :log (default: @log)
+=end
+  def inline( text,  options )
+    raise ArgumentError, "Creole#inline: Options no Hash" unless options.is_a?(Hash)
+    options[:log]           = @log unless options[:log]
+    options[:plugins]      = @plugins unless options[:plugins]
+    options[:inclusions]  = @inclusions unless options[:inclusions]
     res = []  #result
     stack = []  #
     #~ http_regex  =
     #fixme: Only once to reduce runtime
     splitregex = Regexp.new(
       '(' + [
             '\[\[.+?\]\]',  # [[...links]]
-            'http:\/\/.+?\s', #including the next space!!
+            'http:\/\/.+?(\s|\Z)', #including the next space!!
             '\*\*', #bold
             '\/\/', #emph
             '\\\\\\\\', #newline
-            '\{\{\{.*\}\}\}', #inline verbatim
-            '\{\{.*\}\}', #images/inclusion
-            '<<.*>>',   #Plugins
+            '\{\{\{.*?\}\}\}', #inline verbatim
+            '\{\{.*?\}\}', #images/inclusion
+            '<<.*?>>',   #Plugins
             CHARACTERS.keys.join('|')
             ].join('|')  + ')'
     )
@@ -632,7 +758,11 @@ class Creole
           case link
             when /^(https?|ftp):\/\/.+?/
               link = link
-            when /^\./  #lokal file
+            #local file via file://...
+            when /^(file):\/\/(.+)/
+              link = link
+              check_link_existence( $2, options[:log] )
+            when /^\./, /\S:[\\\/]/  #lokal file
               link = link
               check_link_existence( link, options[:log] )
             when /^#/   #internal link
@@ -657,14 +787,17 @@ class Creole
         #All links should be catched before
         when %r{\[\[(.*)\]\]}
           options[:log].error("Lost link <#{el}>") if options[:log].error?
+        #fixme: there are obsolete 2 additional spaces in the result.
         when /^http/ #implicit link
           href = element(:a, {:href=>el.strip}, el.strip )
+          el =~ /(\s|\Z)$/  #get the end-space/newline if available
+          endspace = ( ! $1.empty? ? $1 : nil )
           if stack.last
             stack.last << href
-            stack.last << ' ' #add again the end-space
+            #~ stack.last << last_char #add again the
           else
             res << href
-            res << ' '  #add again the end-space
+            #~ res << last_char  #add again the end-space/newline
           end
         #No-wiki inline: {{{text}}}
         when /\{\{\{(.*)\}\}\}/
@@ -681,9 +814,9 @@ class Creole
         #Available inclusions are defined in Creole::Inclusions resp. Creole#inclusions,
         when /\{\{(.+?)(?:\|(.*))?\}\}/
           if stack.last
-            stack.last << inclusion_or_plugin($1, $2, @inclusions)
+            stack.last << inclusion_or_plugin($1, $2, options[:inclusions])
           else
-            res << inclusion_or_plugin($1, $2, @inclusions)
+            res << inclusion_or_plugin($1, $2, options[:inclusions])
           end
         #Plugin
         #Used like Inclusions.
@@ -691,9 +824,9 @@ class Creole
         #available plugins are defined in Creole::Plugins resp. Creole#plugins
         when /<<(.+?)(?:\|(.*))?>>/
           if stack.last
-            stack.last << inclusion_or_plugin($1, $2, @plugins)
+            stack.last << inclusion_or_plugin($1, $2, options[:plugins])
           else
-            res << inclusion_or_plugin($1, $2, @plugins)
+            res << inclusion_or_plugin($1, $2, options[:plugins])
           end
         #No special wiki command. The text is "normal" text.
         else  #text to add
@@ -720,13 +853,14 @@ class Creole
     }
     res
   end #inline
-  #Inclusion or Plugin.
-  #creole2doc implements a general inclusion.
-  #Main usage are pictures/images ({{picname|alt}}),
-  #but it can be more...
-  #
-  #The last paramter contains a hash with the supported inclusions/plugins.
-  #
+=begin rdoc
+Inclusion or Plugin.
+creole2doc implements a general inclusion.
+Main usage are pictures/images ({{picname|alt}}),
+but it can be more...
+The last paramter contains a hash with the supported inclusions/plugins.
+=end
   def inclusion_or_plugin( link, p_additions, inclusions )
     addition, additions = nil
@@ -744,20 +878,30 @@ class Creole
     ip = inclusion.new( link, addition, additions, self )
     return ip
   end #inclusion
-  #Check for linkes and pictures if the target exist.
+=begin rdoc
+Check for links and pictures if the target exist.
+Absolute DOS-Pathes are detected (C:\...).
+Relative pathes are searched from @options[:targetdir] (default '.').
+=end
   def check_link_existence( filename, log )
-    path = "#{@options[:targetdir]}/#{filename}"
+    case filename
+      when /^.:/#absolute DOS-path
+        path = filename.dup
+      else  #relative path
+        path = "#{@options[:targetdir]}/#{filename}".sub(/^\//, '')
+      end
+    path.sub!(/(\.html?)#.*$/, '\1') #Don't check anchor inside html
     if ! File.exist?(path)
-      log.warn("Reference not found: <#{filename}> (looking at #{@options[:targetdir]})") if log.warn?
-      log.debug("Reference not found: <#{path}>") if log.debug?
+      log.warn("Reference not found: <#{filename}> (looking at <#{path}>)") if log.warn?
+      #~ log.debug("Reference not found: <#{path}>") if log.debug?
       fpath = File.expand_path("#{Dir.pwd}/#{path}")
       log.debug("Reference not found: <#{fpath}>") if log.debug?
     end
 end #check_link_existence
 end #Creole
-if [__FILE__, 'creole_tabular.rb'].include?($0)
+if [__FILE__ ].include?($0)
   #~ [
   #~ :syntax,
@@ -773,5 +917,12 @@ if [__FILE__, 'creole_tabular.rb'].include?($0)
   #~ }
   #~ puts `call "../../unittest/unittest_creole2doc.rb"`
-  require 'quicktest'
+  #~ require 'quicktest'
+  creole = Creole.new
+  creole << 'x{{-}}y{{-}}z'
+  creole << 'x{{shy}}y{{shy}}z'
+  creole << ''
+  creole << '{{../index.html#aa}}'
+  puts creole.to_html
 end