summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2008-12-06 16:50:18 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2008-12-06 16:50:18 +0000
commit3e277841fd42bbe51c55b127542258aebc6cb051 (patch)
treeda5f7826cb3c4c69ce812d59b25c3c04da6da872
parentc88b46a1d151f56cb6253e239d00705af0b1087f (diff)
downloadmandoc-3e277841fd42bbe51c55b127542258aebc6cb051.tar.gz
*** empty log message ***
-rw-r--r--mlg.c22
-rw-r--r--roff.c12
-rw-r--r--roff.h6
3 files changed, 35 insertions, 5 deletions
diff --git a/mlg.c b/mlg.c
index 2cca010d..c8b98b9d 100644
--- a/mlg.c
+++ b/mlg.c
@@ -426,6 +426,17 @@ mlg_roffspecial(void *arg, int tok, const char *start, char **more)
p = (struct md_mlg *)arg;
switch (tok) {
+ case (ROFF_Bt):
+ assert(NULL == *more);
+ if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+ return(0);
+ if ( ! ml_puts(p->mbuf, "is currently in beta "
+ "test.", &p->pos))
+ return(0);
+ if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+ return(0);
+ break;
+
case (ROFF_Xr):
if ( ! *more) {
mlg_err(p, start, start, "missing argument");
@@ -495,6 +506,17 @@ mlg_roffspecial(void *arg, int tok, const char *start, char **more)
return(0);
break;
+ case (ROFF_Ud):
+ assert(NULL == *more);
+ if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+ return(0);
+ if ( ! ml_puts(p->mbuf, "currently under "
+ "development.", &p->pos))
+ return(0);
+ if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+ return(0);
+ break;
+
default:
mlg_err(p, start, start, "`%s' not yet supported",
toknames[tok]);
diff --git a/roff.c b/roff.c
index aef5f45d..1b6e475a 100644
--- a/roff.c
+++ b/roff.c
@@ -660,6 +660,16 @@ roffspecial(struct rofftree *tree, int tok,
return(0);
}
break;
+
+ case (ROFF_Ud):
+ /* FALLTHROUGH */
+ case (ROFF_Bt):
+ if (0 != sz) {
+ roff_err(tree, start, "`%s' expects no args",
+ toknames[tok]);
+ return(0);
+ }
+ break;
default:
break;
}
@@ -1170,8 +1180,6 @@ roff_layout(ROFFCALL_ARGS)
static int
roff_ordered(ROFFCALL_ARGS)
{
- /* FIXME: the tail-switch statement is in two different places:
- * consolidate. */
int i, first, c, argcp[ROFF_MAXLINEARG];
char *ordp[ROFF_MAXLINEARG], *p,
*argvp[ROFF_MAXLINEARG];
diff --git a/roff.h b/roff.h
index ec9de7f4..1930daac 100644
--- a/roff.h
+++ b/roff.h
@@ -199,10 +199,10 @@ static const struct rofftok tokens[ROFF_MAX] = {
{ roff_noop, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */
{ roff_layout, roffarg_Bk, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bk */
{ roff_noop, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */
- { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Bt */
+/*Ok*/ {roff_ordered, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Bt */
{ NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Hf */
- { roff_depr, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Fr */
- { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ud */
+/*Ok*/ { roff_depr, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Fr */
+/*Ok*/ {roff_ordered, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ud */
};
#define ROFF_VALUE (1 << 0)