--- a/Tools__Tag.st	Sat May 31 13:17:33 2014 +0200
+++ b/Tools__Tag.st	Sun Jun 01 12:16:44 2014 +0200
@@ -500,6 +500,12 @@
 
 !
 
+isFunctionOrMethodTag
+    "return true, if this is a function or a method tag 
+    "
+    ^ false
+!
+
 isFunctionTag
     "return true, if this is a function tag 
     "
@@ -930,6 +936,12 @@
 
 !Tag::TFunction methodsFor:'testing'!
 
+isFunctionOrMethodTag
+    "return true, if this is a function or method tag 
+    "
+    ^ true
+!
+
 isFunctionTag
     "return true, if this is a function tag 
     "
@@ -1121,11 +1133,9 @@
 !Tag::TMacro methodsFor:'testing'!
 
 isMacroTag
-    "return true, if this is a define macro tag 
+    "return true, if this is a define macro / macro tag 
     "
     ^ true
-
-
 ! !
 
 !Tag::TMakeRule class methodsFor:'accessing'!
@@ -1231,12 +1241,16 @@
 
 !Tag::TMethod methodsFor:'testing'!
 
-isMethodTag
-    "return true, if this is a java method tag 
+isFunctionOrMethodTag
+    "return true, if this is a function or method tag 
     "
     ^ true
+!
 
-
+isMethodTag
+    "return true, if this is a method tag 
+    "
+    ^ true
 ! !
 
 !Tag::TPackage class methodsFor:'accessing'!
@@ -1410,10 +1424,10 @@
 !Tag class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Tag.st,v 1.10 2014-02-05 18:56:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Tag.st,v 1.11 2014-06-01 10:16:44 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__Tag.st,v 1.10 2014-02-05 18:56:13 cg Exp $'
+    ^ '$Id: Tools__Tag.st,v 1.11 2014-06-01 10:16:44 cg Exp $'
 ! !