From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id o4ONsJww027764
	for <source@mdocml.bsd.lv>; Mon, 24 May 2010 17:54:19 -0600 (MDT)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id o4ONsIIw028068;
	Mon, 24 May 2010 19:54:18 -0400 (EDT)
Date: Mon, 24 May 2010 19:54:18 -0400 (EDT)
Message-Id: <201005242354.o4ONsIIw028068@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: recognize ".if n" as true; nothing fancy yet, no negation, no 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
recognize ".if n" as true;
nothing fancy yet, no negation, no grammer, just that one letter;
from OpenBSD;
"looks fine" kristaps@

Modified Files:
--------------
    mdocml:
        roff.7
        roff.c

Revision Data
-------------
Index: roff.7
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/roff.7,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lroff.7 -Lroff.7 -u -p -r1.6 -r1.7
--- roff.7
+++ roff.7
@@ -126,7 +126,15 @@ which may be separated by any intervenin
 Its syntax is equivalent to
 .Sx \&if .
 .Ss \&if
-Begins a conditional that always evaluates to false.
+Begins a conditional.
+Right now, the conditional evaluates to true
+if and only if it starts with the letter
+.Sy n ,
+indicating processing in
+.Xr nroff 1
+style as opposed to
+.Xr troff 1
+style.
 If a conditional is false, its children are not processed, but are
 syntactically interpreted to preserve the integrity of the input
 document.
@@ -249,7 +257,7 @@ Currently, it is ignored including its a
 and the number of arguments is not checked.
 .Ss \&tr
 Output character translation.
-This macro is intended to have one argument, 
+This macro is intended to have one argument,
 consisting of an even number of characters.
 Currently, it is ignored including its arguments,
 and the number of arguments is not checked.
Index: roff.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/roff.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -Lroff.c -Lroff.c -u -p -r1.83 -r1.84
--- roff.c
+++ roff.c
@@ -575,7 +575,7 @@ roff_cond_sub(ROFF_ARGS)
 	ppos = pos;
 	rr = r->last->rule;
 
-	roffnode_cleanscope(r);
+	roff_cond_text(r, tok, bufp, szp, ln, ppos, pos, offs);
 
 	if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))
 		return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
@@ -616,8 +616,10 @@ roff_cond_text(ROFF_ARGS)
 		return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
 	}
 
-	if (ep > st && '\\' != *(ep - 1))
+	if (ep > st && '\\' != *(ep - 1)) {
+		ep = '\0';
 		roffnode_pop(r);
+	}
 
 	roffnode_cleanscope(r);
 	return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
@@ -628,6 +630,7 @@ roff_cond_text(ROFF_ARGS)
 static enum rofferr
 roff_cond(ROFF_ARGS)
 {
+	int		 cpos;  /* position of the condition */
 	int		 sv;
 
 	/* Stack overflow! */
@@ -637,6 +640,8 @@ roff_cond(ROFF_ARGS)
 		return(ROFF_ERR);
 	}
 
+	cpos = pos;
+
 	if (ROFF_if == tok || ROFF_ie == tok) {
 		/*
 		 * Read ahead past the conditional.  FIXME: this does
@@ -667,9 +672,12 @@ roff_cond(ROFF_ARGS)
 	if ( ! roffnode_push(r, tok, ln, ppos))
 		return(ROFF_ERR);
 
-	/* TODO: here we would evaluate the conditional. */
+	/* XXX: Implement more conditionals. */
 
-	if (ROFF_el == tok) {
+	if (ROFF_if == tok || ROFF_ie == tok)
+		r->last->rule = 'n' == (*bufp)[cpos] ?
+		    ROFFRULE_ALLOW : ROFFRULE_DENY;
+	else if (ROFF_el == tok) {
 		/* 
 		 * An `.el' will get the value of the current rstack
 		 * entry set in prior `ie' calls or defaults to DENY.
@@ -678,7 +686,8 @@ roff_cond(ROFF_ARGS)
 			r->last->rule = ROFFRULE_DENY;
 		else
 			r->last->rule = r->rstack[r->rstackpos];
-	} else if (ROFF_ie == tok) {
+	}
+	if (ROFF_ie == tok) {
 		/*
 		 * An if-else will put the NEGATION of the current
 		 * evaluated conditional into the stack.
@@ -689,6 +698,8 @@ roff_cond(ROFF_ARGS)
 		else
 			r->rstack[r->rstackpos] = ROFFRULE_DENY;
 	}
+	if (r->last->parent && ROFFRULE_DENY == r->last->parent->rule)
+		r->last->rule = ROFFRULE_DENY;
 
 	r->last->endspan = 1;
 
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv