=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- src/usr.bin/mandoc/mdoc_html.c 2017/01/20 19:58:00 1.131 +++ src/usr.bin/mandoc/mdoc_html.c 2017/01/20 21:37:52 1.132 @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_html.c,v 1.131 2017/01/20 19:58:00 schwarze Exp $ */ +/* $OpenBSD: mdoc_html.c,v 1.132 2017/01/20 21:37:52 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze @@ -1485,7 +1485,7 @@ if (n->prev && SEC_SEE_ALSO == n->sec) print_paragraph(h); - print_otag(h, TAG_SPAN, "c", "ref"); + print_otag(h, TAG_SPAN, "c", "Rs"); return 1; } @@ -1530,64 +1530,58 @@ switch (n->tok) { case MDOC__A: - cattr = "ref-auth"; + cattr = "RsA"; if (n->prev && MDOC__A == n->prev->tok) if (NULL == n->next || MDOC__A != n->next->tok) print_text(h, "and"); break; case MDOC__B: - cattr = "ref-book"; t = TAG_I; + cattr = "RsB"; break; case MDOC__C: - cattr = "ref-city"; + cattr = "RsC"; break; case MDOC__D: - cattr = "ref-date"; + cattr = "RsD"; break; case MDOC__I: - cattr = "ref-issue"; t = TAG_I; + cattr = "RsI"; break; case MDOC__J: - cattr = "ref-jrnl"; t = TAG_I; + cattr = "RsJ"; break; case MDOC__N: - cattr = "ref-num"; + cattr = "RsN"; break; case MDOC__O: - cattr = "ref-opt"; + cattr = "RsO"; break; case MDOC__P: - cattr = "ref-page"; + cattr = "RsP"; break; case MDOC__Q: - cattr = "ref-corp"; + cattr = "RsQ"; break; case MDOC__R: - cattr = "ref-rep"; + cattr = "RsR"; break; case MDOC__T: - cattr = "ref-title"; + cattr = "RsT"; break; case MDOC__U: - cattr = "link-ref"; - break; + print_otag(h, TAG_A, "ch", "RsU", n->child->string); + return 1; case MDOC__V: - cattr = "ref-vol"; + cattr = "RsV"; break; default: abort(); } - if (MDOC__U != n->tok) { - print_otag(h, t, "c", cattr); - return 1; - } - - print_otag(h, TAG_A, "ch", cattr, n->child->string); - + print_otag(h, t, "c", cattr); return 1; }