set the default dpi to 192

asmuth · Jun 9, 2020 · f5b10e0 · f5b10e0
1 parent 20fd705
commit f5b10e0
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 21 deletions.
diff --git a/doc/demo.clp b/doc/demo.clp
@@ -1,19 +1,17 @@
-(size 2048px 768px)
-(dpi 240)
-(font "Latin Modern Roman")
-(limit-x (0 7200))
-(limit-y (0 100))
+class: plot;
 
-(axes
-    label-format-x (datetime "%H:%M:%S")
-    label-placement-x (linear-interval 900 900 7000))
+limit-x: 0 7200;
+limit-y: 0 100;
 
-(grid
-    stroke-color (rgba 0 0 0 0.2)
-    stroke-style dashed
-    tick-placement-x (none))
+axes {
+  font: "Latin Modern Roman";
+  font-size: 12pt;
+  label-format-x: datetime("%H:%M:%S");
+  label-placement-x: linear-interval(900 900 7000);
+}
 
-(lines
-    data-x (csv "test/testdata/timeseries.csv" time)
-    data-y (csv "test/testdata/timeseries.csv" value)
-    stroke-width 0.8pt)
+lines {
+  data-x: csv(test/testdata/timeseries.csv time);
+  data-y: csv(test/testdata/timeseries.csv value);
+  stroke-width: 0.8pt;
+}
diff --git a/src/layer.cc b/src/layer.cc
@@ -23,9 +23,9 @@ using namespace std::placeholders;
 namespace clip {
 
 Layer::Layer() :
-    width(from_px(1024)),
-    height(from_px(512)),
-    dpi(96),
+    width(from_px(1600)),
+    height(from_px(800)),
+    dpi(192),
     background_color(Color::fromRGB(1, 1, 1)),
     foreground_color(Color::fromRGB(0, 0, 0)),
     text_color(Color::fromRGB(0, 0, 0)),

diff --git a/test/draw/style_default.clp b/test/draw/style_default.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_fill_hatch.clp b/test/draw/style_fill_hatch.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_fill_hatch_custom.clp b/test/draw/style_fill_hatch_custom.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_fill_hatch_zero.clp b/test/draw/style_fill_hatch_zero.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_fill_multi.clp b/test/draw/style_fill_multi.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_fill_solid.clp b/test/draw/style_fill_solid.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_fill_solid_short.clp b/test/draw/style_fill_solid_short.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_short.clp b/test/draw/style_short.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_stroke_dash.clp b/test/draw/style_stroke_dash.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_stroke_dash_custom.clp b/test/draw/style_stroke_dash_custom.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_stroke_multi.clp b/test/draw/style_stroke_multi.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_stroke_solid.clp b/test/draw/style_stroke_solid.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_stroke_solid_custom.clp b/test/draw/style_stroke_solid_custom.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/style_stroke_solid_short.clp b/test/draw/style_stroke_solid_short.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: 100px 100px;
 
 rectangle {

diff --git a/test/draw/text_basic.clp b/test/draw/text_basic.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: A6*;
 
 text {

diff --git a/test/draw/text_color.clp b/test/draw/text_color.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: A6*;
 
 text {

diff --git a/test/draw/text_custom_font.clp b/test/draw/text_custom_font.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: A6*;
 
 text {

diff --git a/test/draw/text_font_size.clp b/test/draw/text_font_size.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: A6*;
 
 text {

diff --git a/test/draw/text_position.clp b/test/draw/text_position.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: A6*;
 
 text {

diff --git a/test/draw/text_stroke.clp b/test/draw/text_stroke.clp
@@ -1,4 +1,5 @@
 class: draw;
+dpi: 96;
 size: A6*;
 
 text {

diff --git a/test/general/nomodule.svg b/test/general/nomodule.svg
diff --git a/test/layer/resize_a4.clp b/test/layer/resize_a4.clp
@@ -1 +1,2 @@
 size: A4;
+dpi: 96;
diff --git a/test/layer/resize_a4_landscape.clp b/test/layer/resize_a4_landscape.clp
@@ -1 +1,2 @@
 size: A4*;
+dpi: 96;
diff --git a/test/layer/resize_mm.clp b/test/layer/resize_mm.clp
@@ -1 +1,2 @@
+dpi: 96;
 size: 200mm 300mm;