From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id p6MAokBM017577 for ; Fri, 22 Jul 2011 06:50:47 -0400 (EDT) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id p6MAok3D005170; Fri, 22 Jul 2011 06:50:46 -0400 (EDT) Date: Fri, 22 Jul 2011 06:50:46 -0400 (EDT) Message-Id: <201107221050.p6MAok3D005170@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: Add character output (-Tpdf, -Tps, -Tascii) for equations. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- Add character output (-Tpdf, -Tps, -Tascii) for equations. This is the minimum: unseparated terms. Modified Files: -------------- mdocml: Makefile man_term.c mdoc_term.c term.h Added Files: ----------- mdocml: eqn_term.c Revision Data ------------- Index: term.h =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/term.h,v retrieving revision 1.85 retrieving revision 1.86 diff -Lterm.h -Lterm.h -u -p -r1.85 -r1.86 --- term.h +++ term.h @@ -96,6 +96,7 @@ struct termp { struct termp_ps *ps; }; +void term_eqn(struct termp *, const struct eqn *); void term_tbl(struct termp *, const struct tbl_span *); void term_free(struct termp *); void term_newln(struct termp *); Index: man_term.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v retrieving revision 1.114 retrieving revision 1.115 diff -Lman_term.c -Lman_term.c -u -p -r1.114 -r1.115 --- man_term.c +++ man_term.c @@ -905,7 +905,7 @@ print_man_node(DECL_ARGS) p->flags |= TERMP_SENTENCE; return; case (MAN_EQN): - /*term_word(p, n->eqn->data);*/ + term_eqn(p, n->eqn); return; case (MAN_TBL): /* --- /dev/null +++ eqn_term.c @@ -0,0 +1,88 @@ +/* $Id: eqn_term.c,v 1.1 2011/07/22 10:50:46 kristaps Exp $ */ +/* + * Copyright (c) 2011 Kristaps Dzonsons + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include + +#include "mandoc.h" +#include "out.h" +#include "term.h" + +static void eqn_box(struct termp *p, const struct eqn_box *); +static void eqn_box_post(struct termp *p, const struct eqn_box *); +static void eqn_box_pre(struct termp *p, const struct eqn_box *); +static void eqn_text(struct termp *p, const struct eqn_box *); + +void +term_eqn(struct termp *p, const struct eqn *ep) +{ + + p->flags |= TERMP_NONOSPACE; + eqn_box(p, ep->root); + p->flags &= ~TERMP_NONOSPACE; +} + +static void +eqn_box(struct termp *p, const struct eqn_box *bp) +{ + + eqn_box_pre(p, bp); + eqn_text(p, bp); + + if (bp->first) + eqn_box(p, bp->first); + + eqn_box_post(p, bp); + + if (bp->next) + eqn_box(p, bp->next); +} + +static void +eqn_box_pre(struct termp *p, const struct eqn_box *bp) +{ + + if (EQN_LIST == bp->type) + term_word(p, "{"); + if (bp->left) + term_word(p, bp->left); +} + +static void +eqn_box_post(struct termp *p, const struct eqn_box *bp) +{ + + if (EQN_LIST == bp->type) + term_word(p, "}"); + if (bp->right) + term_word(p, bp->right); + if (bp->above) + term_word(p, "|"); +} + +static void +eqn_text(struct termp *p, const struct eqn_box *bp) +{ + + if (bp->text) + term_word(p, bp->text); +} Index: mdoc_term.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_term.c,v retrieving revision 1.232 retrieving revision 1.233 diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.232 -r1.233 --- mdoc_term.c +++ mdoc_term.c @@ -351,7 +351,7 @@ print_mdoc_node(DECL_ARGS) p->flags |= TERMP_NOSPACE; break; case (MDOC_EQN): - /*term_word(p, n->eqn->data);*/ + term_eqn(p, n->eqn); break; case (MDOC_TBL): term_tbl(p, n->span); Index: Makefile =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v retrieving revision 1.358 retrieving revision 1.359 diff -LMakefile -LMakefile -u -p -r1.358 -r1.359 --- Makefile +++ Makefile @@ -50,6 +50,7 @@ SRCS = Makefile \ config.h.pre \ eqn.7 \ eqn.c \ + eqn_term.c \ example.style.css \ external.png \ html.c \ @@ -200,13 +201,15 @@ MANDOC_HTML_LNS = html.ln \ mdoc_html.ln \ tbl_html.ln -MANDOC_TERM_OBJS = man_term.o \ +MANDOC_TERM_OBJS = eqn_term.o \ + man_term.o \ mdoc_term.o \ term.o \ term_ascii.o \ term_ps.o \ tbl_term.o -MANDOC_TERM_LNS = man_term.ln \ +MANDOC_TERM_LNS = eqn_term.ln \ + man_term.ln \ mdoc_term.ln \ term.ln \ term_ascii.ln \ -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv