From 65632676b5ddefc601b0bdddf2e810913460804f Mon Sep 17 00:00:00 2001
From: Leonard Kupper <leonard.kupper@mailbox.tu-dresden.de>
Date: Wed, 21 Aug 2019 12:03:47 +0200
Subject: [PATCH] Do config file revision: Separation of printer and format
 config via include

---
 .../resources/config/index_basic_d.properties | 18 +++----------
 .../config/index_everest_d_v4.properties      | 21 +++------------
 .../config/standard_formats.properties        | 27 +++++++++++++++++++
 3 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 src/main/resources/config/standard_formats.properties

diff --git a/src/main/resources/config/index_basic_d.properties b/src/main/resources/config/index_basic_d.properties
index 7cba7190..0d83722d 100644
--- a/src/main/resources/config/index_basic_d.properties
+++ b/src/main/resources/config/index_basic_d.properties
@@ -1,7 +1,7 @@
 # JProperties Printer & Format Configuration
 #
 # Embosser: Index Basic-D
-# Version 1 Rev. 3 (19-07-23)
+# Version 1 Rev. 4 (19-08-21)
 #
 # Description:
 # This is the main configuration file for use with the braille plot application
@@ -17,7 +17,7 @@
 
 printer.name=Index Basic-D V3
 printer.mode=normalprinter
-printer.brailletable=src/main/resources/mapping/mapping.properties
+printer.brailletable=src/main/resources/mapping/eurobraille.properties
 printer.floatingDot.support=false
 
 # The following values represent the fixed indentation and maximum technical printing area of the embosser.
@@ -44,15 +44,5 @@ printer.raster.dotDiameter=1.5
 ### Format Definitions
 ### ==================
 
-# A4 Format
-format.A4.page.width=210
-format.A4.page.height=297
-format.A4.margin.top=0
-format.A4.margin.left=0
-format.A4.margin.bottom=0
-format.A4.margin.right=0
-
-# B5 Format
-format.B5.page.width=176
-format.B5.page.height=250
-format.B5.isPortrait=false
\ No newline at end of file
+# Standard formats
+include standard_formats
\ No newline at end of file
diff --git a/src/main/resources/config/index_everest_d_v4.properties b/src/main/resources/config/index_everest_d_v4.properties
index 24f7e749..6fd7251a 100644
--- a/src/main/resources/config/index_everest_d_v4.properties
+++ b/src/main/resources/config/index_everest_d_v4.properties
@@ -1,7 +1,7 @@
 # JProperties Printer & Format Configuration
 #
 # Embosser: Index Everest-D V4
-# Version 1 Rev. 9 (19-07-23)
+# Version 2 Rev. 1 (19-08-21)
 #
 # Description:
 # This is the main configuration file for use with the braille plot application
@@ -44,23 +44,10 @@ printer.raster.dotDiameter=1.5
 ### Format Definitions
 ### ==================
 
-# A4 Format
-format.A4.page.width=210
-format.A4.page.height=297
-format.A4.margin.top=0
-format.A4.margin.left=0
-format.A4.margin.bottom=0
-format.A4.margin.right=0
+# Standard formats
+include standard_formats
 
-# A5 Format
-format.A5.page.width=148
-format.A5.page.height=210
-format.A5.margin.top=0
-format.A5.margin.left=0
-format.A5.margin.bottom=0
-format.A5.margin.right=0
-
-# Wide Format
+# Wide Format (non standard, only for testing)
 format.wide.page.width=272
 format.wide.page.height=210
 format.wide.margin.top=0
diff --git a/src/main/resources/config/standard_formats.properties b/src/main/resources/config/standard_formats.properties
new file mode 100644
index 00000000..dac1764e
--- /dev/null
+++ b/src/main/resources/config/standard_formats.properties
@@ -0,0 +1,27 @@
+# JProperties Format Configuration
+#
+# Version 1 Rev. 0 (19-08-21)
+#
+# Description:
+# This is a collection of predefined formats which can be included in a printer configuration.
+#
+# https://gitlab.hrz.tu-chemnitz.de/s9444737--tu-dresden.de/brailleplot/wikis/Software%20Design#configuration-files
+# =============================================================================
+
+### A4 Format No Margin
+### ===================
+format.A4.page.width=210
+format.A4.page.height=297
+format.A4.margin.top=0
+format.A4.margin.left=0
+format.A4.margin.bottom=0
+format.A4.margin.right=0
+
+### A5 Format No Margin
+### ===================
+format.A5.page.width=148
+format.A5.page.height=210
+format.A5.margin.top=0
+format.A5.margin.left=0
+format.A5.margin.bottom=0
+format.A5.margin.right=0
\ No newline at end of file
-- 
GitLab