taskjuggler 0.0.3 → 0.0.4

data/lib/{RichTextProtocolExample.rb → RichTextFunctionExample.rb}

@@ -1,31 +1,32 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextProtocolExample.rb -- The TaskJuggler III Project Management Software
+# = RichTextFunctionExample.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 
-require 'RichTextProtocolHandler'
+require 'RichTextFunctionHandler'
 require 'TjpExample'
 require 'XMLElement'
 
 class TaskJuggler
 
-  # This class is a specialized RichTextProtocolHandler that turns references to
+  # This class is a specialized RichTextFunctionHandler that turns references to
   # TJP example code in the test/TestSuite/Syntax/Correct directory into
   # embedded example code. It currently only supports HTML.
-  class RichTextProtocolExample < RichTextProtocolHandler
+  class RichTextFunctionExample < RichTextFunctionHandler
 
     def initialize
       super(nil, 'example')
+      @blockFunction = true
     end
 
-    # Not supported for this protocol
+    # Not supported for this function
     def to_s(args)
       ''
     end
@@ -51,7 +52,7 @@ class TaskJuggler
       frame
     end
 
-    # Not supported for this protocol.
+    # Not supported for this function.
     def to_tagged(args)
       nil
     end

data/lib/{RichTextProtocolHandler.rb → RichTextFunctionHandler.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextProtocolHandler.rb -- The TaskJuggler III Project Management Software
+# = RichTextFunctionHandler.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -12,31 +12,29 @@
 
 class TaskJuggler
 
-  # This class is the abstract base class for all RichText protocol handlers. A
-  # protocol handler is responsible for a certain protocol such as 'example' or
-  # 'query'. Protocols are used in internal RichText references such as
-  # '[[example:Allocation 2]]'. 'example' is the protocol, 'Allocation' is the
-  # path and '2' is the first argument. Arguments are optional. Protocol handler
+  # This class is the abstract base class for all RichText function handlers. A
+  # function handler is responsible for a certain function such as 'example' or
+  # 'query'. functions are used in internal RichText references such as
+  # '[[example:Allocation 2]]'. 'example' is the function, 'Allocation' is the
+  # path and '2' is the first argument. Arguments are optional. function handler
   # can turn such internal references into Strings or XMLElement trees.
   # Therefor, each derived handler needs to implement a to_s, to_html and
   # to_tagged method that takes two parameter. The first is the path, the second
   # is the argument Array.
-  class RichTextProtocolHandler
+  class RichTextFunctionHandler
 
-    attr_reader :protocol
+    attr_reader :function, :blockFunction
 
-    def initialize(project, protocol, sourceFileInfo = nil)
+    def initialize(project, function, sourceFileInfo = nil)
       @project = project
-      @protocol = protocol
+      @function = function
+      @blockFunction = false
       @sourceFileInfo = sourceFileInfo
     end
 
     def error(id, text)
       message = Message.new(id, 'error', text, nil, nil, @sourceFileInfo)
       @project.sendMessage(message)
-
-      # An empty strings signals an already reported error
-      raise TjException.new, ''
     end
 
   end

data/lib/RichTextParser.rb

@@ -3,7 +3,7 @@
 #
 # = RichTextParser.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -27,15 +27,18 @@ class TaskJuggler
 
     # Create the parser and initialize the rule set. _rt_ is the RichText object
     # the resulting tree of RichTextElement objects should belong to.
-    def initialize(rt, sectionCounter = [ 0, 0, 0] )
+    def initialize(rti, sectionCounter = [ 0, 0, 0], tokenSet = nil)
       super()
-      @richText = rt
+      @richTextI = rti
       # These are the tokens that can be returned by the RichTextScanner.
       @variables = %w( LINEBREAK SPACE WORD BOLD ITALIC CODE BOLDITALIC PRE
                        HREF HREFEND REF REFEND HLINE
+                       QUERY
+                       INLINEFUNCSTART INLINEFUNCEND
                        BLOCKFUNCSTART BLOCKFUNCEND ID STRING
                        TITLE1 TITLE2 TITLE3 TITLE1END TITLE2END TITLE3END
                        BULLET1 BULLET2 BULLET3 NUMBER1 NUMBER2 NUMBER3 )
+      limitTokenSet(tokenSet)
       # Load the rule set into the parser.
       initRules
       # The sections and numbered list can each nest 3 levels deep. We use these

data/lib/RichTextScanner.rb

@@ -3,7 +3,7 @@
 #
 # = RichTextScanner.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -53,6 +53,7 @@ class TaskJuggler
     # This is a wrapper for nextToken only used for debugging.
     #def nextToken
     #  tok = nextTokenI
+    #  raise "Token Error:" unless tok && tok[0] && tok[1]
     #  puts "#{tok[0]}: #{tok[1]}"
     #  tok
     #end
@@ -68,6 +69,8 @@ class TaskJuggler
 
       if @mode == :funcarg
         return nextTokenFuncArg
+      elsif @mode == :href
+        return nextTokenHRef
       end
       if @beginOfLine && @mode == :wiki
         if (res = nextTokenWikiBOL)
@@ -124,7 +127,7 @@ class TaskJuggler
     #  <-inlinefunc par1="value1" ... ->
     def nextTokenFuncArg
       token = [ '.', '<END>' ]
-      while c = nextChar
+      while (c = nextChar)
         case c
         when ' ', "\n", "\t"
           if (tok = readBlanks(c))
@@ -153,6 +156,42 @@ class TaskJuggler
           returnChar
         end
       end
+      token
+    end
+
+    def nextTokenHRef
+      token = [ '.', '<END>' ]
+      while (c = nextChar)
+        if c.nil?
+          # We've reached the end of the text.
+          return [ '.', '<END>' ]
+        elsif c == ' ' || c == "\t" || c == "\n"
+          # Sequences of tabs, spaces and newlines are treated as token
+          # boundaries, but otherwise they are ignored.
+          readSequence(" \n\t")
+          return [ 'SPACE', ' ' ]
+        elsif c == '<' && !@ignoreInlineMarkup
+          if nextChar == '-' && isIdStart(peek(1))
+            token = readId('', 'QUERY')
+            unless nextChar == '-' && nextChar == '>'
+              error('unterminated_query',
+                    "Inline query must be terminated with '->'")
+            end
+            return token
+          else
+            # It's not a query.
+            returnChar(2)
+            @ignoreInlineMarkup = true
+            next
+          end
+        elsif c == ']'
+          @mode = :wiki
+          return [ 'HREFEND', ']' ]
+        else
+          return nextTokenWord(c)
+        end
+      end
+      token
     end
 
     def nextTokenWikiBOL
@@ -234,7 +273,7 @@ class TaskJuggler
       elsif c == ' ' || c == "\t"
         # Sequences of tabs or spaces are treated as token boundaries, but
         # otherwise they are ignored.
-        readSequence(' ', "\t")
+        readSequence(" \t")
         [ 'SPACE', ' ' ]
       elsif c == "'" && !@ignoreInlineMarkup
         # Sequence of 2 ' means italic, 3 ' means bold, 4 ' means monospaced
@@ -270,10 +309,15 @@ class TaskJuggler
         end
       elsif c == '['
         level = readSequenceMax('[', 2)
-        [ level == 1 ? 'HREF' : 'REF', '[' * level ]
-      elsif c == ']'
-        level = readSequenceMax(']', 2)
-        [ level == 1 ? 'HREFEND' : 'REFEND', ']' * level ]
+        if level == 1
+          @mode = :href
+          [ 'HREF' , '[' ]
+        else
+          [ 'REF', '[[' ]
+        end
+      elsif c == ']' && peek == ']'
+        nextChar
+        [ 'REFEND', ']]' ]
       elsif c == "\n"
         nextTokenNewline
       elsif c == '<' && !@ignoreInlineMarkup
@@ -291,7 +335,7 @@ class TaskJuggler
       elsif c == ' ' || c == "\t"
         # Sequences of tabs or spaces are treated as token boundaries, but
         # otherwise they are ignored.
-        readSequence(' ', "\t")
+        readSequence(" \t")
         [ 'SPACE', ' ' ]
       elsif c == "\n"
         nextTokenNewline
@@ -310,14 +354,24 @@ class TaskJuggler
       # the next character into the start of a control sequence.
       # Hard linebreaks consist of a newline followed by another newline or
       # any of the begin-of-line control characters.
-      if (c = nextChar) && "\n*#< =-".include?(c)
+      if (c = nextChar).nil?
+        # We hit the end of the text.
+        [ '.', '<END>' ]
+      elsif c == '<' && peekMatch('[')
+        # the '<' can be a start of a block (BLOCKFUNCSTART) or inline text
+        # (INLINEFUNCSTART). Only for the first case the linebreak is real.
+        returnChar if c != "\n"
+        # The next character may be a control character.
+        @beginOfLine = true
+        [ 'LINEBREAK', "\n" ]
+      elsif "\n*# =-".include?(c)
+        # These characters correspond to the first characters of a block
+        # element. When they are found at the begin of the line, the newline
+        # was really a line break.
         returnChar if c != "\n"
         # The next character may be a control character.
         @beginOfLine = true
         [ 'LINEBREAK', "\n" ]
-      elsif c.nil?
-        # We hit the end of the text.
-        [ '.', '<END>' ]
       else
         # Single line breaks are treated as spaces. Return the char after
         # the newline and start with this one again.
@@ -335,6 +389,11 @@ class TaskJuggler
         # Turn most wiki markup interpretation on.
         @pos += '/nowiki>'.length
         @mode = :wiki
+      elsif peekMatch('-') && @mode == :wiki
+        nextChar
+        # Switch the parser to function argument parsing mode.
+        @mode = :funcarg
+        return [ 'INLINEFUNCSTART', '<-' ]
       else
         # We've not found a valid control sequence. Push back the character
         # and make sure we treat it as a normal character.
@@ -353,11 +412,15 @@ class TaskJuggler
       str << c
       # Now we can collect characters of a word until we hit a whitespace.
       while (c = nextChar) && !" \n\t".include?(c)
-        if @mode == :wiki
+        case @mode
+        when :wiki
           # Or at least to ' characters in a row.
           break if c == "'" && peek == "'"
-          # Or a ] or <
+          # Or a -, ] or <
           break if ']<'.include?(c)
+        when :href
+          # Look for - of the end mark -> end ']'
+          break if c == '-' || c == ']' || c == '<'
         else
           # Make sure we find the </nowiki> tag even within a word.
           break if c == '<'
@@ -372,7 +435,12 @@ class TaskJuggler
     # Deliver the next character. Keep track of the cursor position. In case we
     # reach the end, nil is returned.
     def nextChar
-      return nil if @pos >= @textLength
+      if @pos >= @textLength
+        # Correct @pos so that returnChar works properly but mutliple reads of
+        # EOT are ignored.
+        @pos = @textLength + 1
+        return nil
+      end
       c = @text[@pos]
       @pos += 1
       if c == ?\n
@@ -430,9 +498,9 @@ class TaskJuggler
     # Read a sequence of characters that are all contained in the _chars_ Array.
     # If a character is found that is not in _chars_ the method returns the so
     # far found sequence of chars as String.
-    def readSequence(*chars)
+    def readSequence(chars)
       sequence = ''
-      while chars.include?(c = nextChar)
+      while (c = nextChar) && chars.index(c)
         sequence << c
       end
       # Push back the character that did no longer match.
@@ -485,7 +553,11 @@ class TaskJuggler
       end
     end
 
-    def readId(c)
+    def isIdStart(c)
+      (('a'..'z') === c || ('A'..'Z') === c || c == '_')
+    end
+
+    def readId(c, tokenType = 'ID')
       token = ""
       token << c
       while (c = nextChar) &&
@@ -494,7 +566,7 @@ class TaskJuggler
         token << c
       end
       returnChar
-      return [ 'ID', token ]
+      return [ tokenType, token ]
     end
 
     def readString(terminator)

data/lib/RichTextSnip.rb

@@ -3,7 +3,7 @@
 #
 # = RichTextSnip.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -40,18 +40,23 @@ class TaskJuggler
         file.each_line { |line| text += line }
       end
       begin
-        @richText = RichText.new(text, sectionCounter)
+        rText = RichText.new(text, @document.functionHandlers)
+        @richText = rText.generateIntermediateFormat(sectionCounter)
       rescue RichTextException => msg
         $stderr.puts "Error in RichText of file '#{fileName}'\n" +
                      "Line #{msg.lineNo}: #{msg.text}\n" +
                      "#{msg.line}"
         exit
       end
-      @richText.setProtocolHandlers(@document.protocolHandlers)
 
       @prevSnip = @nextSnip = nil
     end
 
+    # Set the target for all anchor links in the document.
+    def linkTarget=(target)
+      @richText.linkTarget = target
+    end
+
     # Generate a TableOfContents object from the section headers of the
     # RichTextSnip.
     def tableOfContents(toc, fileName)

data/lib/RichTextSyntaxRules.rb

@@ -3,7 +3,7 @@
 #
 # = RichTextSyntaxRules.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ class TaskJuggler
     # This is the entry node.
     def rule_richtext
       pattern(%w( !sections !blankLines . ), lambda {
-        el = RichTextElement.new(@richText, :richtext, @val[0])
+        el = RichTextElement.new(@richTextI, :richtext, @val[0])
       })
     end
 
@@ -44,20 +44,20 @@ class TaskJuggler
         @val[0]
       })
       pattern(%w( $HLINE !blankLines ), lambda {
-        RichTextElement.new(@richText, :hline, @val[0])
+        RichTextElement.new(@richTextI, :hline, @val[0])
       })
       pattern(%w( !paragraph ), lambda {
         @val[0]
       })
       pattern(%w( $PRE ), lambda {
-        RichTextElement.new(@richText, :pre, @val[0])
+        RichTextElement.new(@richTextI, :pre, @val[0])
       })
       pattern(%w( !bulletList1 ), lambda {
-        RichTextElement.new(@richText, :bulletlist1, @val[0])
+        RichTextElement.new(@richTextI, :bulletlist1, @val[0])
       })
       pattern(%w( !numberList1 ), lambda {
         @numberListCounter = [ 0, 0, 0 ]
-        RichTextElement.new(@richText, :numberlist1, @val[0])
+        RichTextElement.new(@richTextI, :numberlist1, @val[0])
       })
       pattern(%w( !blockFunction !blankLines ), lambda {
         @val[0]
@@ -79,7 +79,7 @@ class TaskJuggler
     def rule_title1
       pattern(%w( $TITLE1 !text $TITLE1END ), lambda {
         @val[1][-1].appendSpace = false
-        el = RichTextElement.new(@richText, :title1, @val[1])
+        el = RichTextElement.new(@richTextI, :title1, @val[1])
         @sectionCounter[0] += 1
         @sectionCounter[1] = @sectionCounter[2] = 0
         el.data = @sectionCounter.dup
@@ -90,7 +90,7 @@ class TaskJuggler
     def rule_title2
       pattern(%w( $TITLE2 !text $TITLE2END ), lambda {
         @val[1][-1].appendSpace = false
-        el = RichTextElement.new(@richText, :title2, @val[1])
+        el = RichTextElement.new(@richTextI, :title2, @val[1])
         @sectionCounter[1] += 1
         @sectionCounter[2] = 0
         el.data = @sectionCounter.dup
@@ -101,7 +101,7 @@ class TaskJuggler
     def rule_title3
       pattern(%w( $TITLE3 !text $TITLE3END ), lambda {
         @val[1][-1].appendSpace = false
-        el = RichTextElement.new(@richText, :title3, @val[1])
+        el = RichTextElement.new(@richTextI, :title3, @val[1])
         @sectionCounter[2] += 1
         el.data = @sectionCounter.dup
         el
@@ -112,27 +112,27 @@ class TaskJuggler
       optional
       repeatable
       pattern(%w( $BULLET1 !text $LINEBREAK), lambda {
-        RichTextElement.new(@richText, :bulletitem1, @val[1])
+        RichTextElement.new(@richTextI, :bulletitem1, @val[1])
       })
       pattern(%w( !bulletList2 ), lambda {
-        RichTextElement.new(@richText, :bulletlist2, @val[0])
+        RichTextElement.new(@richTextI, :bulletlist2, @val[0])
       })
     end
 
     def rule_bulletList2
       repeatable
       pattern(%w( $BULLET2 !text $LINEBREAK), lambda {
-        RichTextElement.new(@richText, :bulletitem2, @val[1])
+        RichTextElement.new(@richTextI, :bulletitem2, @val[1])
       })
       pattern(%w( !bulletList3 ), lambda {
-        RichTextElement.new(@richText, :bulletlist3, @val[0])
+        RichTextElement.new(@richTextI, :bulletlist3, @val[0])
       })
     end
 
     def rule_bulletList3
       repeatable
       pattern(%w( $BULLET3 !text $LINEBREAK), lambda {
-        RichTextElement.new(@richText, :bulletitem3, @val[1])
+        RichTextElement.new(@richTextI, :bulletitem3, @val[1])
       })
     end
 
@@ -140,35 +140,35 @@ class TaskJuggler
       optional
       repeatable
       pattern(%w( $NUMBER1 !text $LINEBREAK), lambda {
-        el = RichTextElement.new(@richText, :numberitem1, @val[1])
+        el = RichTextElement.new(@richTextI, :numberitem1, @val[1])
         @numberListCounter[0] += 1
         el.data = @numberListCounter.dup
         el
       })
       pattern(%w( !numberList2 ), lambda {
         @numberListCounter[1, 2] = [ 0, 0 ]
-        RichTextElement.new(@richText, :numberlist2, @val[0])
+        RichTextElement.new(@richTextI, :numberlist2, @val[0])
       })
     end
 
     def rule_numberList2
       repeatable
       pattern(%w( $NUMBER2 !text $LINEBREAK), lambda {
-        el = RichTextElement.new(@richText, :numberitem2, @val[1])
+        el = RichTextElement.new(@richTextI, :numberitem2, @val[1])
         @numberListCounter[1] += 1
         el.data = @numberListCounter.dup
         el
       })
       pattern(%w( !numberList3 ), lambda {
         @numberListCounter[2] = 0
-        RichTextElement.new(@richText, :numberlist3, @val[0])
+        RichTextElement.new(@richTextI, :numberlist3, @val[0])
       })
     end
 
     def rule_numberList3
       repeatable
       pattern(%w( $NUMBER3 !text $LINEBREAK), lambda {
-        el = RichTextElement.new(@richText, :numberitem3, @val[1])
+        el = RichTextElement.new(@richTextI, :numberitem3, @val[1])
         @numberListCounter[2] += 1
         el.data = @numberListCounter.dup
         el
@@ -177,7 +177,7 @@ class TaskJuggler
 
     def rule_paragraph
       pattern(%w( !text $LINEBREAK ), lambda {
-        RichTextElement.new(@richText, :paragraph, @val[0])
+        RichTextElement.new(@richTextI, :paragraph, @val[0])
       })
     end
 
@@ -186,26 +186,36 @@ class TaskJuggler
       pattern(%w( !plainTextWithLinks ), lambda {
         @val[0]
       })
-      pattern(%w( $ITALIC !plainTextWithLinks $ITALIC !space ), lambda {
-        el = RichTextElement.new(@richText, :italic, @val[1])
-        el.appendSpace = !@val[3].empty?
+      pattern(%w( !inlineFunction ), lambda {
+        @val[0]
+      })
+      pattern(%w( $ITALIC !space !plainTextWithLinks $ITALIC !space ), lambda {
+        el = RichTextElement.new(@richTextI, :italic, @val[2])
+        # Since the italic end marker will disappear we need to make sure
+        # there was no space before it.
+        @val[2].last.appendSpace = false if @val[2].last
+        el.appendSpace = !@val[4].empty?
         el
       })
-      pattern(%w( $BOLD !plainTextWithLinks $BOLD !space ), lambda {
-        el = RichTextElement.new(@richText, :bold, @val[1])
-        el.appendSpace = !@val[3].empty?
+      pattern(%w( $BOLD !space !plainTextWithLinks $BOLD !space ), lambda {
+        el = RichTextElement.new(@richTextI, :bold, @val[2])
+        @val[2].last.appendSpace = false if @val[2].last
+        el.appendSpace = !@val[4].empty?
         el
       })
-      pattern(%w( $CODE !plainTextWithLinks $CODE !space ), lambda {
-        el = RichTextElement.new(@richText, :code, @val[1])
-        el.appendSpace = !@val[3].empty?
+      pattern(%w( $CODE !space !plainTextWithLinks $CODE !space ), lambda {
+        el = RichTextElement.new(@richTextI, :code, @val[2])
+        @val[2].last.appendSpace = false if @val[2].last
+        el.appendSpace = !@val[4].empty?
         el
       })
-      pattern(%w( $BOLDITALIC !plainTextWithLinks $BOLDITALIC !space ), lambda {
-        el = RichTextElement.new(@richText,
-                            :bold, RichTextElement.new(@richText,
-                                                       :italic, @val[1]))
-        el.appendSpace = !@val[3].empty?
+      pattern(%w( $BOLDITALIC !space !plainTextWithLinks $BOLDITALIC !space ),
+              lambda {
+        el = RichTextElement.new(@richTextI,
+                            :bold, RichTextElement.new(@richTextI,
+                                                       :italic, @val[2]))
+        @val[2].last.appendSpace = false if @val[2].last
+        el.appendSpace = !@val[4].empty?
         el
       })
     end
@@ -216,8 +226,8 @@ class TaskJuggler
         @val[0]
       })
       pattern(%w( $REF $WORD !space !plainText $REFEND !space ), lambda {
-        el = RichTextElement.new(@richText, :ref,
-                                 RichTextElement.new(@richText,
+        el = RichTextElement.new(@richTextI, :ref,
+                                 RichTextElement.new(@richTextI,
                                                      :text, @val[3].empty? ?
                                                      @val[1] :
                                                      @val[3].join(' ')))
@@ -225,28 +235,53 @@ class TaskJuggler
         el.appendSpace = !@val[5].empty?
         el
       })
-      pattern(%w( $HREF $WORD !space !plainText $HREFEND !space ), lambda {
-        el = RichTextElement.new(@richText, :href,
-                                 RichTextElement.new(@richText,
-                                                     :text, @val[3].empty? ?
-                                                     @val[1] :
-                                                     @val[3].join(' ')))
-        el.data = @val[1]
+      pattern(%w( $HREF !wordWithQueries !space !plainTextWithQueries
+                  $HREFEND !space ), lambda {
+        el = RichTextElement.new(@richTextI, :href, @val[3].empty? ?
+                                 @val[1] : @val[3])
+        el.data = RichTextElement.new(@richTextI, :richtext, @val[1])
         el.appendSpace = !@val[5].empty?
         el
       })
     end
 
+    def rule_wordWithQueries
+      repeatable
+      pattern(%w( $WORD ), lambda {
+        RichTextElement.new(@richTextI, :text, @val[0])
+      })
+      pattern(%w( $QUERY ), lambda {
+        # The ${attribute} syntax is a shortcut for an embedded query inline
+        # function. It can only be used within a ReportTableCell context that
+        # provides a property and a scope property.
+        el = RichTextElement.new(@richTextI, :inlinefunc)
+        # Data is a 2 element Array with the function name and a Hash for the
+        # arguments.
+        el.data = ['query', { 'attribute' => @val[0] } ]
+        el
+      })
+
+    end
+
     def rule_plainText
       repeatable
       optional
       pattern(%w( $WORD !space ), lambda {
-        el = RichTextElement.new(@richText, :text, @val[0])
+        el = RichTextElement.new(@richTextI, :text, @val[0])
         el.appendSpace = !@val[1].empty?
         el
       })
     end
 
+    def rule_plainTextWithQueries
+      repeatable
+      optional
+      pattern(%w( !wordWithQueries !space ), lambda {
+        @val[0][-1].appendSpace = true if !@val[1].empty?
+        @val[0]
+      })
+    end
+
     def rule_space
       optional
       repeatable
@@ -267,10 +302,33 @@ class TaskJuggler
               lambda {
         args = {}
         @val[2].each { |arg| args[arg[0]] = arg[1] }
-        el = RichTextElement.new(@richText, :blockfunc)
+        el = RichTextElement.new(@richTextI, :blockfunc)
+        # Data is a 2 element Array with the function name and a Hash for the
+        # arguments.
+        unless @richTextI.richText.functionHandler(@val[1], true)
+          error('bad_block_function',
+                "Unsupported block function #{@val[1]}")
+        end
+        el.data = [@val[1], args ]
+        el
+      })
+    end
+
+    def rule_inlineFunction
+      pattern(%w( $INLINEFUNCSTART $ID !functionArguments $INLINEFUNCEND
+                  !space ),
+              lambda {
+        args = {}
+        @val[2].each { |arg| args[arg[0]] = arg[1] }
+        el = RichTextElement.new(@richTextI, :inlinefunc)
         # Data is a 2 element Array with the function name and a Hash for the
         # arguments.
+        unless @richTextI.richText.functionHandler(@val[1], false)
+          error('bad_inline_function',
+                "Unsupported inline function #{@val[1]}")
+        end
         el.data = [@val[1], args ]
+        el.appendSpace = !@val[4].empty?
         el
       })
     end