release: 1.5.43

[lilypond.git] / lily / include / dimensions.hh

diff --git a/lily/include/dimensions.hh b/lily/include/dimensions.hh
index 896af5dc428858724eefb4089ed1f4e48130b875..66a9d0868d36bb2215c608a30f291fdc2820235c 100644 (file)
--- a/lily/include/dimensions.hh
+++ b/lily/include/dimensions.hh
@@ -2,16 +2,19 @@
 #define DIMENSIONS_HH
 
 #include "real.hh"
-#include "string.hh"
+class String;
+
 
 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 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 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
@@ -20,6 +23,17 @@ const Real CHAR_TO_PT =1.0;
 #define BIGPOINT *BIGPOINT_TO_POINT
 #define CHAR *CHAR_TO_PT
 
+#else  // 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);
 
 #endif // DIMENSIONS_HH