org-collector unable to handle macros

[Mark Edgington <edgimar@gmail.com>]

I have had problems getting org-collector.el to generate tables where the
content of the tables should include macros.  At some point in the past this
worked, but at this time (latest git version of org-mode), the following
example fails (unless you remove the macro from the property definition):

# comment-macro
#+MACRO: c 

* Notes
:PROPERTIES: 
:ID: sched_table
:COLUMNS:  %WEEKNUM(Week #) %DAY(Day) %INCLASS(In-class Content)
%READINGS(Readings) %PRECLASS(Pre-class Assignments / Homework)
:END:
** WEEK 1
*** DAY
:PROPERTIES:
:INCLASS:  ABC {{{c(stuff)}}} DEF
:DAY:      T
:WEEKNUM:  1
:END:
blah

* Schedule
# type C-c C-c on the #BEGIN line to attempt to generate the table
#+BEGIN: propview :id "sched_table" :defaultval "" :conds ((not (string= DAY
""))) :cols (WEEKNUM DAY INCLASS READINGS PRECLASS) :noquote t :colnames
("Week #" Day "In-class Content" "Readings" "Pre-class Assignments / Homework")

#+END:


Any help in resolving this problem would be appreciated!  Thanks.