[svn-upgrade] Integrating new upstream version, ion3 (20070203)

[ion3.git] / de / private.h

diff --git a/de/private.h b/de/private.h
index 39141e6fc2aa4fe239dff33889ea7426172feddd..dde51c4ef26c98d861dcc00ee8638b2b573def4d 100644 (file)
--- a/de/private.h
+++ b/de/private.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/private.h
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,10 @@
 #define DE_SUB_IND " ->"
 #define DE_SUB_IND_LEN 3
 
-#define MATCHES(S, A) (gr_stylespec_score(S, A)>0)
-#define MATCHES2(S, A1, A2) (gr_stylespec_score2(S, A1, A2)>0)
+#define MATCHES(S, A) (gr_stylespec_score(&(S), A)>0)
+#define MATCHES2(S, A1, A2) (gr_stylespec_score2(&(S), A1, A2)>0)
 
+#define ENSURE_INITSPEC(S, NM) \
+    if((S).attrs==NULL) gr_stylespec_load(&(S), NM);
+    
 #endif /* ION_DE_PRIVATE_H */