From 276d1fbe1b3fff3e400eb2ecd8f52e6ceb0e3619 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Sat, 27 Feb 2010 19:04:09 +0000 Subject: cleaning up template definitions --- (limited to 'taconstants.py') diff --git a/taconstants.py b/taconstants.py index 2dd93fc..47c95ab 100644 --- a/taconstants.py +++ b/taconstants.py @@ -876,144 +876,157 @@ MACROS = { [2, 'setxy', 0, 0, [0, 3, 4, 5]], [3, 'titlex', 0, 0, [2, None]], [4, 'titley', 0, 0, [2, None]], - [5, 'show', 0, 0, [2, 6, 7]], - [6, ['string',_('Title')], 0, 0, [5, None]], - [7, 'setxy', 0, 0, [5, 8, 9, 10]], - [8, 'leftx', 0, 0, [7, None]], - [9, 'topy', 0, 0, [7, None]], - [10, 'list', 0, 0, [7, 11, 12, 13]], - [11, ['string','∙ '], 0, 0, [10, None]], - [12, ['string','∙ '], 0, 0, [10, None]], - [13, 'sandwichbottom', 0, 0, [10, None]]], + [5, 'setscale', 0, 0, [2, 6, 7]], + [6, ['number', '100'], 0, 0, [5, None]], + [7, 'show', 0, 0, [5, 8, 9]], + [8, ['string',_('Title')], 0, 0, [7, None]], + [9, 'setxy', 0, 0, [7, 10, 11, 12]], + [10, 'leftx', 0, 0, [9, None]], + [11, 'topy', 0, 0, [9, None]], + [12, 'setscale', 0, 0, [9, 13, 14]], + [13, ['number', '67'], 0, 0, [12, None]], + [14, 'list', 0, 0, [12, 15, 16, 17]], + [15, ['string','∙ '], 0, 0, [14, None]], + [16, ['string','∙ '], 0, 0, [14, None]], + [17, 'sandwichbottom', 0, 0, [14, None]]], 'picture1x1a': [[0, 'sandwichtop', 0, 0, [None, 1, 2]], [1, ['string', _('picture')], 0, 0, [0, None]], [2, 'setxy', 0, 0, [0, 3, 4, 5]], [3, 'titlex', 0, 0, [2, None]], [4, 'titley', 0, 0, [2, None]], - [5, 'show', 0, 0, [2, 6, 7]], - [6, ['string',_('Title')], 0, 0, [5, None]], - [7, 'setscale', 0, 0, [5, 8, 9]], - [8, ['number', '90'], 0, 0, [7, None]], - [9, 'setxy', 0, 0, [7, 10, 11, 12]], - [10, 'leftx', 0, 0, [9, None]], - [11, 'topy', 0, 0, [9, None]], - [12, 'showaligned', 0, 0, [9, 13, 14]], - [13, 'journal', 0, 0, [12, None]], - [14, 'sandwichbottom', 0, 0, [12, None]]], + [5, 'setscale', 0, 0, [2, 6, 7]], + [6, ['number', '100'], 0, 0, [5, None]], + [7, 'show', 0, 0, [5, 8, 9]], + [8, ['string',_('Title')], 0, 0, [7, None]], + [9, 'setscale', 0, 0, [7, 10, 11]], + [10, ['number', '90'], 0, 0, [9, None]], + [11, 'setxy', 0, 0, [9, 12, 13, 14]], + [12, 'leftx', 0, 0, [11, None]], + [13, 'topy', 0, 0, [11, None]], + [14, 'showaligned', 0, 0, [11, 15, 16]], + [15, 'journal', 0, 0, [14, None]], + [16, 'sandwichbottom', 0, 0, [14, None]]], 'picture2x2': [[0, 'sandwichtop', 0, 0, [None, 1, 2]], [1, ['string', _('2×2 pictures')], 0, 0, [0, None]], [2, 'setxy', 0, 0, [0, 3, 4, 5]], [3, 'titlex', 0, 0, [2, None]], [4, 'titley', 0, 0, [2, None]], - [5, 'show', 0, 0, [2, 6, 7]], - [6, ['string',_('Title')], 0, 0, [5, None]], - [7, 'setscale', 0, 0, [5, 8, 9]], - [8, ['number', '35'], 0, 0, [7, None]], - [9, 'setxy', 0, 0, [7, 10, 11, 12]], - [10, 'leftx', 0, 0, [9, None]], - [11, 'topy', 0, 0, [9, None]], - [12, 'showaligned', 0, 0, [9, 13, 14]], - [13, 'journal', 0, 0, [12, None]], - [14, 'setxy', 0, 0, [12, 15, 16, 17]], - [15, 'rightx', 0, 0, [14, None]], - [16, 'topy', 0, 0, [14, None]], - [17, 'showaligned', 0, 0, [14, 18, 19]], - [18, 'journal', 0, 0, [17, None]], - [19, 'setxy', 0, 0, [17, 20, 21, 22]], - [20, 'leftx', 0, 0, [19, None]], - [21, 'bottomy', 0, 0, [19, None]], - [22, 'showaligned', 0, 0, [19, 23, 24]], - [23, 'journal', 0, 0, [22, None]], - [24, 'setxy', 0, 0, [22, 25, 26, 27]], - [25, 'rightx', 0, 0, [24, None]], - [26, 'bottomy', 0, 0, [24, None]], - [27, 'showaligned', 0, 0, [24, 28, 29]], - [28, 'journal', 0, 0, [27, None]], - [29, 'sandwichbottom', 0, 0, [27, None]]], + [5, 'setscale', 0, 0, [2, 6, 7]], + [6, ['number', '100'], 0, 0, [5, None]], + [7, 'show', 0, 0, [5, 8, 9]], + [8, ['string',_('Title')], 0, 0, [7, None]], + [9, 'setscale', 0, 0, [7, 10, 11]], + [10, ['number', '35'], 0, 0, [9, None]], + [11, 'setxy', 0, 0, [9, 12, 13, 14]], + [12, 'leftx', 0, 0, [11, None]], + [13, 'topy', 0, 0, [11, None]], + [14, 'showaligned', 0, 0, [11, 15, 16]], + [15, 'journal', 0, 0, [14, None]], + [16, 'setxy', 0, 0, [14, 17, 18, 19]], + [17, 'rightx', 0, 0, [16, None]], + [18, 'topy', 0, 0, [16, None]], + [19, 'showaligned', 0, 0, [16, 20, 21]], + [20, 'journal', 0, 0, [19, None]], + [21, 'setxy', 0, 0, [19, 22, 23, 24]], + [22, 'leftx', 0, 0, [21, None]], + [23, 'bottomy', 0, 0, [21, None]], + [24, 'showaligned', 0, 0, [21, 25, 26]], + [25, 'journal', 0, 0, [24, None]], + [26, 'setxy', 0, 0, [24, 27, 28, 29]], + [27, 'rightx', 0, 0, [26, None]], + [28, 'bottomy', 0, 0, [26, None]], + [29, 'showaligned', 0, 0, [26, 30, 31]], + [30, 'journal', 0, 0, [29, None]], + [31, 'sandwichbottom', 0, 0, [29, None]]], 'picture2x1': [[0, 'sandwichtop', 0, 0, [None, 1, 2]], [1, ['string', _('2×1 pictures')], 0, 0, [0, None]], [2, 'setxy', 0, 0, [0, 3, 4, 5]], [3, 'titlex', 0, 0, [2, None]], [4, 'titley', 0, 0, [2, None]], - [5, 'show', 0, 0, [2, 6, 7]], - [6, ['string',_('Title')], 0, 0, [5, None]], - [7, 'setscale', 0, 0, [5, 8, 9]], - [8, ['number', '35'], 0, 0, [7, None]], - [9, 'setxy', 0, 0, [7, 10, 11, 12]], - [10, 'leftx', 0, 0, [9, None]], - [11, 'topy', 0, 0, [9, None]], - [12, 'showaligned', 0, 0, [9, 13, 14]], - [13, 'journal', 0, 0, [12, None]], - [14, 'setxy', 0, 0, [12, 15, 16, 17]], - [15, 'leftx', 0, 0, [14, None]], - [16, 'bottomy', 0, 0, [14, None]], - [17, 'showaligned', 0, 0, [14, 18, 19]], - [18, 'description', 0, 0, [17, None]], - [19, 'setxy', 0, 0, [17, 20, 21, 22]], - [20, 'rightx', 0, 0, [19, None]], - [21, 'topy', 0, 0, [19, None]], - [22, 'showaligned', 0, 0, [19, 23, 24]], - [23, 'journal', 0, 0, [22, None]], - [24, 'setxy', 0, 0, [22, 25, 26, 27]], - [25, 'rightx', 0, 0, [24, None]], - [26, 'bottomy', 0, 0, [24, None]], - [27, 'showaligned', 0, 0, [24, 28, 29]], - [28, 'description', 0, 0, [27, None]], - [29, 'sandwichbottom', 0, 0, [27, None]]], + [5, 'setscale', 0, 0, [2, 6, 7]], + [6, ['number', '100'], 0, 0, [5, None]], + [7, 'show', 0, 0, [5, 8, 9]], + [8, ['string',_('Title')], 0, 0, [7, None]], + [9, 'setscale', 0, 0, [7, 10, 11]], + [10, ['number', '35'], 0, 0, [9, None]], + [11, 'setxy', 0, 0, [9, 12, 13, 14]], + [12, 'leftx', 0, 0, [11, None]], + [13, 'topy', 0, 0, [11, None]], + [14, 'showaligned', 0, 0, [11, 15, 16]], + [15, 'journal', 0, 0, [14, None]], + [16, 'setxy', 0, 0, [14, 17, 18, 19]], + [17, 'leftx', 0, 0, [16, None]], + [18, 'bottomy', 0, 0, [16, None]], + [19, 'showaligned', 0, 0, [16, 20, 21]], + [20, 'description', 0, 0, [19, None]], + [21, 'setxy', 0, 0, [19, 22, 23, 24]], + [22, 'rightx', 0, 0, [21, None]], + [23, 'topy', 0, 0, [21, None]], + [24, 'showaligned', 0, 0, [21, 25, 26]], + [25, 'journal', 0, 0, [24, None]], + [26, 'setxy', 0, 0, [24, 27, 28, 29]], + [27, 'rightx', 0, 0, [26, None]], + [28, 'bottomy', 0, 0, [26, None]], + [29, 'showaligned', 0, 0, [26, 30, 31]], + [30, 'description', 0, 0, [29, None]], + [31, 'sandwichbottom', 0, 0, [29, None]]], 'picture1x2': [[0, 'sandwichtop', 0, 0, [None, 1, 2]], [1, ['string', _('1×2 pictures')], 0, 0, [0, None]], [2, 'setxy', 0, 0, [0, 3, 4, 5]], [3, 'titlex', 0, 0, [2, None]], [4, 'titley', 0, 0, [2, None]], - [5, 'show', 0, 0, [2, 6, 7]], - [6, ['string',_('Title')], 0, 0, [5, None]], - [7, 'setscale', 0, 0, [5, 8, 9]], - [8, ['number', '35'], 0, 0, [7, None]], - [9, 'setxy', 0, 0, [7, 10, 11, 12]], - [10, 'leftx', 0, 0, [9, None]], - [11, 'topy', 0, 0, [9, None]], - [12, 'showaligned', 0, 0, [9, 13, 14]], - [13, 'journal', 0, 0, [12, None]], - [14, 'setxy', 0, 0, [12, 15, 16, 17]], - [15, 'rightx', 0, 0, [14, None]], - [16, 'topy', 0, 0, [14, None]], - [17, 'showaligned', 0, 0, [14, 18, 19]], - [18, 'description', 0, 0, [17, None]], - [19, 'setxy', 0, 0, [17, 20, 21, 22]], - [20, 'leftx', 0, 0, [19, None]], - [21, 'bottomy', 0, 0, [19, None]], - [22, 'showaligned', 0, 0, [19, 23, 24]], - [23, 'journal', 0, 0, [22, None]], - [24, 'setxy', 0, 0, [22, 25, 26, 27]], - [25, 'rightx', 0, 0, [24, None]], - [26, 'bottomy', 0, 0, [24, None]], - [27, 'showaligned', 0, 0, [24, 28, 29]], - [28, 'description', 0, 0, [27, None]], - [29, 'sandwichbottom', 0, 0, [27, None]]], + [5, 'setscale', 0, 0, [2, 6, 7]], + [6, ['number', '100'], 0, 0, [5, None]], + [7, 'show', 0, 0, [5, 8, 9]], + [8, ['string',_('Title')], 0, 0, [7, None]], + [9, 'setscale', 0, 0, [7, 10, 11]], + [10, ['number', '35'], 0, 0, [9, None]], + [11, 'setxy', 0, 0, [9, 12, 13, 14]], + [12, 'leftx', 0, 0, [11, None]], + [13, 'topy', 0, 0, [11, None]], + [14, 'showaligned', 0, 0, [11, 15, 16]], + [15, 'journal', 0, 0, [14, None]], + [16, 'setxy', 0, 0, [14, 17, 18, 19]], + [17, 'rightx', 0, 0, [16, None]], + [18, 'topy', 0, 0, [16, None]], + [19, 'showaligned', 0, 0, [16, 20, 21]], + [20, 'description', 0, 0, [19, None]], + [21, 'setxy', 0, 0, [19, 22, 23, 24]], + [22, 'leftx', 0, 0, [21, None]], + [23, 'bottomy', 0, 0, [21, None]], + [24, 'showaligned', 0, 0, [21, 25, 26]], + [25, 'journal', 0, 0, [24, None]], + [26, 'setxy', 0, 0, [24, 27, 28, 29]], + [27, 'rightx', 0, 0, [26, None]], + [28, 'bottomy', 0, 0, [26, None]], + [29, 'showaligned', 0, 0, [26, 30, 31]], + [30, 'description', 0, 0, [29, None]], + [31, 'sandwichbottom', 0, 0, [29, None]]], 'picture1x1': [[0, 'sandwichtop', 0, 0, [None, 1, 2]], - [1, ['string', _('1×1 picture')], 0, 0, [0, None]], + [1, ['string', _('1×1 pictures')], 0, 0, [0, None]], [2, 'setxy', 0, 0, [0, 3, 4, 5]], [3, 'titlex', 0, 0, [2, None]], [4, 'titley', 0, 0, [2, None]], - [5, 'show', 0, 0, [2, 6, 7]], - [6, ['string',_('Title')], 0, 0, [5, None]], - [7, 'setscale', 0, 0, [5, 8, 9]], - [8, ['number', '45'], 0, 0, [7, None]], - [9, 'setxy', 0, 0, [7, 10, 11, 12]], - [10, 'leftx', 0, 0, [9, None]], - [11, 'topy', 0, 0, [9, None]], - [12, 'showaligned', 0, 0, [9, 13, 14]], - [13, 'journal', 0, 0, [12, None]], - [14, 'setxy', 0, 0, [12, 15, 16, 17]], - [15, 'rightx', 0, 0, [14, None]], - [16, 'topy', 0, 0, [14, None]], - [17, 'showaligned', 0, 0, [14, 18, 19]], - [18, 'description', 0, 0, [17, None]], - [19, 'sandwichbottom', 0, 0, [17, None]]] + [5, 'setscale', 0, 0, [2, 6, 7]], + [6, ['number', '100'], 0, 0, [5, None]], + [7, 'show', 0, 0, [5, 8, 9]], + [8, ['string',_('Title')], 0, 0, [7, None]], + [9, 'setscale', 0, 0, [7, 10, 11]], + [10, ['number', '35'], 0, 0, [9, None]], + [11, 'setxy', 0, 0, [9, 12, 13, 14]], + [12, 'leftx', 0, 0, [11, None]], + [13, 'topy', 0, 0, [11, None]], + [14, 'showaligned', 0, 0, [11, 15, 16]], + [15, 'journal', 0, 0, [14, None]], + [16, 'setxy', 0, 0, [14, 17, 18, 19]], + [17, 'rightx', 0, 0, [16, None]], + [18, 'topy', 0, 0, [16, None]], + [19, 'showaligned', 0, 0, [16, 20, 21]], + [20, 'description', 0, 0, [19, None]], + [21, 'sandwichbottom', 0, 0, [19, None]]], } - -- cgit v0.9.1