From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Move `Lb' handling from mdoc_action.c into mdoc_validate.c.
Date: Mon, 29 Nov 2010 09:56:43 -0500 (EST) [thread overview]
Message-ID: <201011291456.oATEuhir006687@krisdoz.my.domain> (raw)
Log Message:
-----------
Move `Lb' handling from mdoc_action.c into mdoc_validate.c.
Modified Files:
--------------
mdocml:
mdoc_action.c
mdoc_validate.c
Revision Data
-------------
Index: mdoc_validate.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_validate.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.126 -r1.127
--- mdoc_validate.c
+++ mdoc_validate.c
@@ -1077,16 +1077,37 @@ post_bf(POST_ARGS)
return(1);
}
-
static int
post_lb(POST_ARGS)
{
+ const char *p;
+ char *buf;
+ size_t sz;
+
+ assert(mdoc->last->child);
+ assert(MDOC_TEXT == mdoc->last->child->type);
+
+ p = mdoc_a2lib(mdoc->last->child->string);
+
+ /* If lookup ok, replace with table value. */
- if (mdoc_a2lib(mdoc->last->child->string))
+ if (p) {
+ free(mdoc->last->child->string);
+ mdoc->last->child->string = mandoc_strdup(p);
return(1);
- return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADLIB));
-}
+ }
+
+ /* If not, use "library ``xxxx''. */
+ sz = strlen(mdoc->last->child->string) +
+ 2 + strlen("\\(lqlibrary\\(rq");
+ buf = mandoc_malloc(sz);
+ snprintf(buf, sz, "library \\(lq%s\\(rq",
+ mdoc->last->child->string);
+ free(mdoc->last->child->string);
+ mdoc->last->child->string = buf;
+ return(1);
+}
static int
post_eoln(POST_ARGS)
Index: mdoc_action.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_action.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -Lmdoc_action.c -Lmdoc_action.c -u -p -r1.82 -r1.83
--- mdoc_action.c
+++ mdoc_action.c
@@ -58,7 +58,6 @@ static int post_bl_width(POST_ARGS);
static int post_dd(POST_ARGS);
static int post_display(POST_ARGS);
static int post_dt(POST_ARGS);
-static int post_lb(POST_ARGS);
static int post_nm(POST_ARGS);
static int post_os(POST_ARGS);
static int post_pa(POST_ARGS);
@@ -176,7 +175,7 @@ static const struct actions mdoc_actions
{ NULL, NULL }, /* Hf */
{ NULL, NULL }, /* Fr */
{ NULL, NULL }, /* Ud */
- { NULL, post_lb }, /* Lb */
+ { NULL, NULL }, /* Lb */
{ NULL, NULL }, /* Lp */
{ NULL, NULL }, /* Lk */
{ NULL, NULL }, /* Mt */
@@ -330,39 +329,6 @@ post_nm(POST_ARGS)
m->meta.name = mandoc_strdup(buf);
return(1);
}
-
-
-/*
- * Look up the value of `Lb' for matching predefined strings. If it has
- * one, then substitute the current value for the formatted value. Note
- * that the lookup may fail (we can provide arbitrary strings).
- */
-/* ARGSUSED */
-static int
-post_lb(POST_ARGS)
-{
- const char *p;
- char *buf;
- size_t sz;
-
- assert(MDOC_TEXT == n->child->type);
- p = mdoc_a2lib(n->child->string);
-
- if (p) {
- free(n->child->string);
- n->child->string = mandoc_strdup(p);
- return(1);
- }
-
- sz = strlen(n->child->string) +
- 2 + strlen("\\(lqlibrary\\(rq");
- buf = mandoc_malloc(sz);
- snprintf(buf, sz, "library \\(lq%s\\(rq", n->child->string);
- free(n->child->string);
- n->child->string = buf;
- return(1);
-}
-
/*
* Substitute the value of `St' for the corresponding formatted string.
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2010-11-29 14:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201011291456.oATEuhir006687@krisdoz.my.domain \
--to=kristaps@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).