Run `make grand-replace'.

[lilypond.git] / flower / include / direction.hh

diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index 0572f786ce8ad62d2e31215ae96583f2ac19ec2f..ceff68fe5506dc135e5cfebba40f0e4b203f79bc 100644 (file)
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -3,29 +3,39 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef DIRECTION_HH
 #define DIRECTION_HH
 
-#include "axes.hh"
+#include "axis.hh"
 
-enum Direction 
-{
-  UP=1,
-  DOWN=-1,
-  LEFT=-1,
-  RIGHT=1,
-  MIN=-1,
-  MAX=1,
-  CENTER=0,
-  SMALLER=-1,
-  BIGGER=1,
-  START = -1,
-  STOP = 1,
-};
+enum Direction
+  {
+    UP = 1,
+    DOWN=-1,
+    LEFT=-1,
+    RIGHT = 1,
+    MIN=-1,
+    MAX = 1,
+    CENTER = 0,
+    SMALLER=-1,
+    BIGGER = 1,
+    START = -1,
+    STOP = 1,
+
+    /*
+      This is necessary to safely write loops,
+      since
+
+      dir <= RIGHT
+
+      is otherwise transformed into true unconditionally.
+    */
+    DIRECTION_LIMIT = 2,
+    DIRECTION_NEG_LIMIT = -2,
+  };
 
 inline Direction
 other_dir (Direction const d)
@@ -41,10 +51,11 @@ operator - (Direction const d)
 
 // huh?
 inline Direction
-flip (Direction *i) {
+flip (Direction *i)
+{
   if (*i == (Direction)1)
-    *i = (Direction)-1;
-  else if (*i == (Direction)-1)
+    *i = (Direction) - 1;
+  else if (*i == (Direction) - 1)
     *i = (Direction)1;
   return *i;
 }
@@ -52,7 +63,7 @@ flip (Direction *i) {
 /**
    if d > 0: the max operator
    if d < 0: the min operator
- */
+*/
 template<class T> T minmax (Direction d, T, T);
 
 // String direction_string (Direction, Axis);