Change Avery dimensions according to @wvoigt's suggestion - looks good to me
This commit is contained in:
parent
d8de5db94a
commit
0c1860266c
38
.bzrignore
38
.bzrignore
@ -1,38 +0,0 @@
|
|||||||
dist
|
|
||||||
card_images
|
|
||||||
build
|
|
||||||
sumpfork_dominion_tabs_A4_v1.3.pdf
|
|
||||||
sumpfork_dominion_tabs_A4_v1.4.pdf
|
|
||||||
sumpfork_dominion_tabs_A4_v1.5.pdf
|
|
||||||
sumpfork_dominion_tabs_cornucopia.pdf
|
|
||||||
sumpfork_dominion_tabs_sameside_v1.1.pdf
|
|
||||||
sumpfork_dominion_tabs_sleeved_v1.3.pdf
|
|
||||||
sumpfork_dominion_tabs_sleeved_v1.4.pdf
|
|
||||||
sumpfork_dominion_tabs_sleeved_v1.5.pdf
|
|
||||||
sumpfork_dominion_tabs_v1.0.pdf
|
|
||||||
sumpfork_dominion_tabs_v1.1.pdf
|
|
||||||
sumpfork_dominion_tabs_v1.2.pdf
|
|
||||||
sumpfork_dominion_tabs_v1.3.pdf
|
|
||||||
sumpfork_dominion_tabs_v1.4.pdf
|
|
||||||
sumpfork_dominion_tabs_v1.5.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_A4_v1.3.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_A4_v1.5.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_sameside_v1.1.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_sleeved_v1.3.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_sleeved_v1.4.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_sleeved_v1.5.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_v1.1.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_v1.2.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_v1.3.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_v1.4.pdf
|
|
||||||
sumpfork_dominion_tabs_vertical_v1.5.pdf
|
|
||||||
fonts
|
|
||||||
old_images
|
|
||||||
sumpfork_dominion_tabs_v1.3.zip
|
|
||||||
sumpfork_dominion_tabs_v1.4.zip
|
|
||||||
sumpfork_dominion_tabs_v1.5.zip
|
|
||||||
dominion_tabs.pdf
|
|
||||||
sumpfork_dominion_tabs_*
|
|
||||||
dominiontabs.egg-info
|
|
||||||
generated
|
|
||||||
.DS_Store
|
|
||||||
@ -26,6 +26,7 @@ def split(l, n):
|
|||||||
class Card(object):
|
class Card(object):
|
||||||
|
|
||||||
class CardJSONEncoder(json.JSONEncoder):
|
class CardJSONEncoder(json.JSONEncoder):
|
||||||
|
|
||||||
def default(self, obj):
|
def default(self, obj):
|
||||||
if isinstance(obj, Card):
|
if isinstance(obj, Card):
|
||||||
return obj.__dict__
|
return obj.__dict__
|
||||||
@ -870,14 +871,14 @@ class DominionTabs:
|
|||||||
fixedMargins = False
|
fixedMargins = False
|
||||||
if self.options.tabs_only:
|
if self.options.tabs_only:
|
||||||
# fixed for Avery 8867 for now
|
# fixed for Avery 8867 for now
|
||||||
minmarginwidth = 0.76 * cm
|
minmarginwidth = 0.86 * cm # was 0.76
|
||||||
minmarginheight = 1.27 * cm
|
minmarginheight = 1.37 * cm # was 1.27
|
||||||
self.tabLabelHeight = 1.27 * cm
|
self.tabLabelHeight = 1.07 * cm # was 1.27
|
||||||
self.tabLabelWidth = 4.44 * cm
|
self.tabLabelWidth = 4.24 * cm # was 4.44
|
||||||
|
self.horizontalBorderSpace = 0.96 * cm # was 0.76
|
||||||
|
self.verticalBorderSpace = 0.20 * cm # was 0.01
|
||||||
self.tabBaseHeight = 0
|
self.tabBaseHeight = 0
|
||||||
self.tabWidth = self.tabLabelWidth
|
self.tabWidth = self.tabLabelWidth
|
||||||
self.horizontalBorderSpace = 0.76 * cm
|
|
||||||
self.verticalBorderSpace = 0.01 * cm
|
|
||||||
fixedMargins = True
|
fixedMargins = True
|
||||||
else:
|
else:
|
||||||
minmarginwidth, minmarginheight = self.parseDimensions(
|
minmarginwidth, minmarginheight = self.parseDimensions(
|
||||||
@ -897,9 +898,6 @@ class DominionTabs:
|
|||||||
self.totalTabWidth = self.tabWidth + self.horizontalBorderSpace
|
self.totalTabWidth = self.tabWidth + self.horizontalBorderSpace
|
||||||
self.totalTabHeight = self.tabHeight + self.verticalBorderSpace
|
self.totalTabHeight = self.tabHeight + self.verticalBorderSpace
|
||||||
|
|
||||||
print "Paper dimensions: %fcm (w) x %fcm (h)" % (self.paperwidth / cm, self.paperheight / cm)
|
|
||||||
print "Tab dimensions: %fcm (w) x %fcm (h)" % (self.totalTabWidth / cm, self.totalTabHeight / cm)
|
|
||||||
|
|
||||||
# as we don't draw anything in the final border, it shouldn't count towards how many tabs we can fit
|
# as we don't draw anything in the final border, it shouldn't count towards how many tabs we can fit
|
||||||
# so it gets added back in to the page size here
|
# so it gets added back in to the page size here
|
||||||
numTabsVerticalP = int(
|
numTabsVerticalP = int(
|
||||||
@ -923,6 +921,10 @@ class DominionTabs:
|
|||||||
self.minHorizontalMargin = minmarginwidth
|
self.minHorizontalMargin = minmarginwidth
|
||||||
self.minVerticalMargin = minmarginheight
|
self.minVerticalMargin = minmarginheight
|
||||||
|
|
||||||
|
print "Paper dimensions: {:.2f}cm (w) x {:.2f}cm (h)".format(self.paperwidth / cm, self.paperheight / cm)
|
||||||
|
print "Tab dimensions: {:.2f}cm (w) x {:.2f}cm (h)".format(self.totalTabWidth / cm, self.totalTabHeight / cm)
|
||||||
|
print '{} dividers horizontally, {} vertically'.format(self.numTabsHorizontal, self.numTabsVertical)
|
||||||
|
|
||||||
if not fixedMargins:
|
if not fixedMargins:
|
||||||
# dynamically max margins
|
# dynamically max margins
|
||||||
self.horizontalMargin = (
|
self.horizontalMargin = (
|
||||||
@ -933,8 +935,8 @@ class DominionTabs:
|
|||||||
self.horizontalMargin = minmarginwidth
|
self.horizontalMargin = minmarginwidth
|
||||||
self.verticalMargin = minmarginheight
|
self.verticalMargin = minmarginheight
|
||||||
|
|
||||||
print "Margins: %fcm h, %fcm v\n" % (self.horizontalMargin / cm,
|
print "Margins: {:.2f}cm h, {:.2f}cm v\n".format(self.horizontalMargin / cm,
|
||||||
self.verticalMargin / cm)
|
self.verticalMargin / cm)
|
||||||
|
|
||||||
self.tabOutline = [(0, 0, self.tabWidth, 0),
|
self.tabOutline = [(0, 0, self.tabWidth, 0),
|
||||||
(self.tabWidth, 0, self.tabWidth, self.tabHeight),
|
(self.tabWidth, 0, self.tabWidth, self.tabHeight),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user