X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2Fyaptu.py;h=5c8d14febaa48d40f1030be6567cfadffcdf31b3;hb=b8ca4a544cce3e6023bb56b712a03d6362f2bb79;hp=e3669aaf7018e0a3292e6e289d53d8f0b2770f2a;hpb=532dab5ed9c5a51af5736e893e9b4a1af698bac4;p=senf.git

diff --git a/doclib/yaptu.py b/doclib/yaptu.py
index e3669aa..5c8d14f 100644
--- a/doclib/yaptu.py
+++ b/doclib/yaptu.py
@@ -79,7 +79,7 @@ class copier:
         self.locals['_bl'] = block
         self.copyblock()
 
-_RE_EXPR = re.compile('{([^{}]+)}')
+_RE_EXPR = re.compile('\${([^{}]+)}')
 _RE_BEGIN = re.compile('{{')
 _RE_END = re.compile('}}')
 _RE_CONT = re.compile(r'\|\|')
@@ -87,8 +87,6 @@ _RE_CONT = re.compile(r'\|\|')
 def process(text,*args):
     vardict = {}
     for arg in args : vardict.update(arg)
-    vardict['obr'] = '{'
-    vardict['cbr'] = '}'
     output = StringIO()
     c = copier(_RE_EXPR, vardict, _RE_BEGIN, _RE_END, _RE_CONT,
                ouf = output)