Run grand replace for 2015.

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

diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index 0ba482fe2c580ff9ac73926879c075484439decc..f3b31e3811a7c5245c294cbd72322b9dc3cd184d 100644 (file)
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,30 +23,30 @@
 #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,
-
-    /*
-      This is necessary to safely write loops,
-      since
-
-      dir <= RIGHT
-
-      is otherwise transformed into true unconditionally.
-    */
-    DIRECTION_LIMIT = 2,
-    DIRECTION_NEG_LIMIT = -2,
-  };
+{
+  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)
@@ -60,7 +60,7 @@ operator - (Direction const d)
   return other_dir (d);
 }
 
-// huh?
+// to be deleted soon (after coping with issues 2491 and 2493
 inline Direction
 flip (Direction *i)
 {
@@ -71,11 +71,26 @@ flip (Direction *i)
   return *i;
 }
 
+#define UP_and_DOWN(d) \
+  Direction d = UP; d != CENTER; d = (d == UP ? DOWN : CENTER)
+
+#define DOWN_and_UP(d) \
+  Direction d = DOWN; d != CENTER; d = (d == DOWN ? UP : CENTER)
+
+#define LEFT_and_RIGHT(d) \
+  Direction d = LEFT; d != CENTER; d = (d == LEFT ? RIGHT : CENTER)
+
 /**
    if d > 0: the max operator
    if d < 0: the min operator
 */
-template<class T> T minmax (Direction d, T, T);
+template<class T> T minmax (Direction d, T a, T b)
+{
+  if (d == UP)
+    return max (a, b);
+  else
+    return min (a, b);
+}
 
 // String direction_string (Direction, Axis);