aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/render11
-rw-r--r--conf/settings/hex-paper/25mm.yaml8
-rw-r--r--designs/hex-paper-25mm-a4.yaml12
3 files changed, 26 insertions, 5 deletions
diff --git a/bin/render b/bin/render
index a8aa6ba..ece7e3b 100755
--- a/bin/render
+++ b/bin/render
@@ -29,8 +29,9 @@ class Renderer:
self.args = self.parser.parse_args()
def load_design(self, design):
+ yaml = ruamel.yaml.YAML(typ='safe', pure=True)
with open(design, 'r') as fp:
- design = ruamel.yaml.safe_load(fp)
+ design = yaml.load(fp)
template = design['template']
settings = {}
with open(os.path.join(
@@ -38,26 +39,26 @@ class Renderer:
'paper',
design['paper']+'.yaml'
), 'r') as fp:
- settings.update(ruamel.yaml.safe_load(fp))
+ settings.update(yaml.load(fp))
with open(os.path.join(
'conf',
'margins',
design['margins']+'.yaml'
), 'r') as fp:
- settings.update(ruamel.yaml.safe_load(fp))
+ settings.update(yaml.load(fp))
with open(os.path.join(
'conf',
'theme',
design['theme']+'.yaml'
), 'r') as fp:
- settings.update(ruamel.yaml.safe_load(fp))
+ settings.update(yaml.load(fp))
with open(os.path.join(
'conf',
'settings',
template,
design['settings']+'.yaml'
), 'r') as fp:
- settings.update(ruamel.yaml.safe_load(fp))
+ settings.update(yaml.load(fp))
settings.update(design.get('override', {}))
return template, settings
diff --git a/conf/settings/hex-paper/25mm.yaml b/conf/settings/hex-paper/25mm.yaml
new file mode 100644
index 0000000..6dce40a
--- /dev/null
+++ b/conf/settings/hex-paper/25mm.yaml
@@ -0,0 +1,8 @@
+hex_side: 25 mm
+
+x_spacing: 0
+y_spacing: 0
+uniform_spacing: true
+
+x_trasl: 0 mm
+y_trasl: 0 mm
diff --git a/designs/hex-paper-25mm-a4.yaml b/designs/hex-paper-25mm-a4.yaml
new file mode 100644
index 0000000..d41de3d
--- /dev/null
+++ b/designs/hex-paper-25mm-a4.yaml
@@ -0,0 +1,12 @@
+template: hex-paper
+paper: a4
+margins: 10mm
+theme: thin_lines
+settings: 25mm
+override:
+ x_trasl: '8.1 mm'
+ y_trasl: '23.5 mm'
+ margin_right: '7 mm'
+ margin_left: '8 mm'
+ margin_top: '11 mm'
+ margin_bottom: '11 mm'