X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fdimensions.hh;h=a0e2f25edd9203e83f24288e4dde9c1c6b2db5ad;hb=9578677bb2b3929964e8cc2c906df5c98b8a50c4;hp=896af5dc428858724eefb4089ed1f4e48130b875;hpb=41549679c389cb99771b11f55c629a53806c0ee0;p=lilypond.git

diff --git a/lily/include/dimensions.hh b/lily/include/dimensions.hh
index 896af5dc42..a0e2f25edd 100644
--- a/lily/include/dimensions.hh
+++ b/lily/include/dimensions.hh
@@ -2,25 +2,47 @@
 #define DIMENSIONS_HH
 
 #include "real.hh"
-#include "string.hh"
+#include "std-string.hh"
 
-const Real INCH_TO_PT=72.270;
-const Real CM_TO_PT=INCH_TO_PT/2.54;
-const Real MM_TO_PT=CM_TO_PT/10;
-const Real PT_TO_PT =1.0;
+const Real INCH_TO_PT = 72.270;
+const Real CM_TO_PT = (INCH_TO_PT / 2.54);
+const Real MM_TO_PT = (CM_TO_PT / 10);
+const Real PT_TO_PT = 1.0;
 const Real INCH_TO_BP = 72;
-const Real BIGPOINT_TO_POINT = INCH_TO_PT/ INCH_TO_BP;
-const Real CHAR_TO_PT =1.0;
+const Real BIGPOINT_TO_POINT = (INCH_TO_PT / INCH_TO_BP);
+const Real CHAR_TO_PT = 1.0;
+const Real PT_TO_MM = (1.0 / MM_TO_PT);
 
+#ifdef POINTS
 
-#define PT  *PT_TO_PT
-#define MM  *MM_TO_PT
-#define CM  *CM_TO_PT
-#define INCH *INCH_TO_PT
-#define BIGPOINT *BIGPOINT_TO_POINT
-#define CHAR *CHAR_TO_PT
+#define INTERNAL_UNIT "pt"
 
-String print_dimen (Real);
+#define PT *(PT_TO_PT)
+#define MM *(MM_TO_PT)
+#define CM *(CM_TO_PT)
+#define INCH *(INCH_TO_PT)
+#define BIGPOINT *(BIGPOINT_TO_POINT)
+#define CHAR *(CHAR_TO_PT)
 
-#endif // DIMENSIONS_HH
+#else // mm
+
+#define INTERNAL_UNIT "mm"
+
+#define PT *(PT_TO_PT *PT_TO_MM)
+#define MM *(MM_TO_PT *PT_TO_MM)
+#define CM *(CM_TO_PT *PT_TO_MM)
+#define INCH *(INCH_TO_PT *PT_TO_MM)
+#define BIGPOINT *(BIGPOINT_TO_POINT *PT_TO_MM)
+#define CHAR *(CHAR_TO_PT *PT_TO_MM)
+
+#endif
+
+string print_dimen (Real);
+const Real point_constant = 1 PT;
+const Real inch_constant = 1 INCH;
+const Real cm_constant = 1 CM;
+const Real mm_constant = 1 MM;
+const Real bigpoint_constant = 1 BIGPOINT;
+
+#endif /* DIMENSIONS_HH */