Merge branch 'master' into lilypond/translation

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

diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index 5ff8da855d0e188a79a7864912342fc930a42908..befd0aa2ac207e4f2a18208a45bbf0ddb611047b 100644 (file)
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -1,31 +1,52 @@
 /*
-  direction.hh -- declare Direction
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 +62,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,8 +74,14 @@ flip (Direction *i) {
 /**
    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);