- aktuellste Buchstaben von Eva rein

libs/piccreate.py

@@ -65,8 +65,6 @@ class Word:
         return deltax
     def GetSVG(self):
         params = self.params
-        content = dict()
-        content['posy'] = params['y']
         # berechne immer den richtigen Startpunkt, je nach Bündigkeit
         if params['align'] == 'left':
             x = float(params['x'])
@@ -76,11 +74,23 @@ class Word:
         else:
             word_length = self.calc_length()
             x = float(params['x'] + word_length - params['length'])
+        y = params['y']
+
         svgstr = ''
+        counter = 0
         for c in self.line:
+            content = dict()
+            content['posy'] = y
             g = self.font.GlyphGet(c)
             x  =  g.GetLength() + x
             content['posx'] = str(x)
+            # wenn im Buchstaben Platzhalter (x1, x2, x3,...) drin sind, dann
+            # diese durch den aktuellen Zählerstand ersetzen
+            if params['counter_replace']:
+                xn = g.GetAttribute('npattern')
+                for i in range(1,int(xn)+1):
+                    counter = counter + 1
+                    content['x'+str(i)] = counter
             svgstr = svgstr + g.GetSVG(content)
         return svgstr
 
@@ -187,11 +197,8 @@ def create_picture(config, fontinfos, data, pic_path):
         font = fontinfos[fontname]
 
         # hol dir die Eckdaten für die Zeile
-        params = dict()
-        params['x'] = config.get(linename, 'x')
-        params['y'] = config.get(linename, 'y')
-        params['length']= config.get(linename, 'length')
-        params['align']= config.get(linename, 'align')
+        # x, y, align, length
+        params = dict(config.items(linename))
 
         picstr = write_font_line( content, font, params )
         if picstr: svgstr = svgstr + picstr