Obey ADDOMIT in calendar mode as well as command-line mode.

This commit is contained in:
Dianne Skoll
2021-11-20 20:05:00 -05:00
parent 47d33e7aaf
commit 430d0990aa
2 changed files with 10 additions and 1 deletions

View File

@@ -16,7 +16,7 @@ install:
echo "Not installing rem2html; Perl is required"; exit 0; fi; \
for m in $(PERLMODS_NEEDED) ; \
do \
perl -M$$m -e 1 > /dev/null 2>&1; \
$(PERL) -M$$m -e 1 > /dev/null 2>&1; \
if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \
done; \
echo "Installing rem2html in $(DESTDIR)$(bindir)"; \

View File

@@ -1440,6 +1440,15 @@ static int DoCalRem(ParsePtr p, int col)
}
}
/* Add to global OMITs if so indicated */
if (trig.addomit) {
r = AddGlobalOmit(jul);
if (r) {
FreeTrig(&trig);
return r;
}
}
/* Save nonconst_expr flag */
nonconst_expr = p->nonconst_expr;
/* Convert PS and PSF to PASSTHRU */