* mdocml: implement tag priority 0, which will tag only keys that appear
@ 2016-11-08 16:24 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2016-11-08 16:24 UTC (permalink / raw)
To: source
Log Message:
-----------
implement tag priority 0, which will tag only keys that appear as
tag candidates exactly once, and use it for .Em and .Sy;
written on the TGV Toulouse-Paris
Modified Files:
--------------
mdocml:
mdoc_term.c
tag.c
Revision Data
-------------
Index: mdoc_term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_term.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.333 -r1.334
--- mdoc_term.c
+++ mdoc_term.c
@@ -95,6 +95,7 @@ static int termp_bx_pre(DECL_ARGS);
static int termp_cd_pre(DECL_ARGS);
static int termp_d1_pre(DECL_ARGS);
static int termp_eo_pre(DECL_ARGS);
+static int termp_em_pre(DECL_ARGS);
static int termp_er_pre(DECL_ARGS);
static int termp_ex_pre(DECL_ARGS);
static int termp_fa_pre(DECL_ARGS);
@@ -119,6 +120,7 @@ static int termp_skip_pre(DECL_ARGS);
static int termp_sm_pre(DECL_ARGS);
static int termp_sp_pre(DECL_ARGS);
static int termp_ss_pre(DECL_ARGS);
+static int termp_sy_pre(DECL_ARGS);
static int termp_tag_pre(DECL_ARGS);
static int termp_under_pre(DECL_ARGS);
static int termp_ud_pre(DECL_ARGS);
@@ -195,7 +197,7 @@ static const struct termact termacts[MDO
{ termp_quote_pre, termp_quote_post }, /* Dq */
{ NULL, NULL }, /* Ec */ /* FIXME: no space */
{ NULL, NULL }, /* Ef */
- { termp_under_pre, NULL }, /* Em */
+ { termp_em_pre, NULL }, /* Em */
{ termp_eo_pre, termp_eo_post }, /* Eo */
{ termp_xx_pre, NULL }, /* Fx */
{ termp_bold_pre, NULL }, /* Ms */
@@ -218,7 +220,7 @@ static const struct termact termacts[MDO
{ termp_quote_pre, termp_quote_post }, /* Sq */
{ termp_sm_pre, NULL }, /* Sm */
{ termp_under_pre, NULL }, /* Sx */
- { termp_bold_pre, NULL }, /* Sy */
+ { termp_sy_pre, NULL }, /* Sy */
{ NULL, NULL }, /* Tn */
{ termp_xx_pre, NULL }, /* Ux */
{ NULL, NULL }, /* Xc */
@@ -2214,6 +2216,26 @@ termp_under_pre(DECL_ARGS)
{
term_fontpush(p, TERMFONT_UNDER);
+ return 1;
+}
+
+static int
+termp_em_pre(DECL_ARGS)
+{
+ if (n->child != NULL &&
+ n->child->type == ROFFT_TEXT)
+ tag_put(n->child->string, 0, p->line);
+ term_fontpush(p, TERMFONT_UNDER);
+ return 1;
+}
+
+static int
+termp_sy_pre(DECL_ARGS)
+{
+ if (n->child != NULL &&
+ n->child->type == ROFFT_TEXT)
+ tag_put(n->child->string, 0, p->line);
+ term_fontpush(p, TERMFONT_BOLD);
return 1;
}
Index: tag.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tag.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -Ltag.c -Ltag.c -u -p -r1.15 -r1.16
--- tag.c
+++ tag.c
@@ -155,14 +155,22 @@ tag_put(const char *s, int prio, size_t
} else {
+ /* Handle priority 0 entries. */
+
+ if (prio == 0) {
+ if (entry->prio == 0)
+ entry->prio = -1;
+ return;
+ }
+
/* A better entry is already present, ignore the new one. */
- if (entry->prio < prio)
+ if (entry->prio > 0 && entry->prio < prio)
return;
/* The existing entry is worse, clear it. */
- if (entry->prio > prio)
+ if (entry->prio < 1 || entry->prio > prio)
entry->nlines = 0;
}
@@ -194,7 +202,7 @@ tag_write(void)
stream = fdopen(tag_files.tfd, "w");
entry = ohash_first(&tag_data, &slot);
while (entry != NULL) {
- if (stream != NULL)
+ if (stream != NULL && entry->prio >= 0)
for (i = 0; i < entry->nlines; i++)
fprintf(stream, "%s %s %zu\n",
entry->s, tag_files.ofn, entry->lines[i]);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-11-08 16:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-08 16:24 mdocml: implement tag priority 0, which will tag only keys that appear schwarze
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).