[BACK]Return to roff_html.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff_html.c between version 1.1 and 1.8

version 1.1, 2017/05/04 22:16:09 version 1.8, 2017/06/08 12:54:58
Line 1 
Line 1 
 /*      $OpenBSD$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
    * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 17 
Line 18 
 #include <sys/types.h>  #include <sys/types.h>
   
 #include <assert.h>  #include <assert.h>
   #include <stddef.h>
   
 #include "roff.h"  #include "roff.h"
 #include "out.h"  #include "out.h"
Line 27 
Line 29 
 typedef void    (*roff_html_pre_fp)(ROFF_HTML_ARGS);  typedef void    (*roff_html_pre_fp)(ROFF_HTML_ARGS);
   
 static  void      roff_html_pre_br(ROFF_HTML_ARGS);  static  void      roff_html_pre_br(ROFF_HTML_ARGS);
   static  void      roff_html_pre_ce(ROFF_HTML_ARGS);
   static  void      roff_html_pre_sp(ROFF_HTML_ARGS);
   
 static  const roff_html_pre_fp roff_html_pre_acts[ROFF_MAX] = {  static  const roff_html_pre_fp roff_html_pre_acts[ROFF_MAX] = {
         roff_html_pre_br,  /* br */          roff_html_pre_br,  /* br */
           roff_html_pre_ce,  /* ce */
           NULL,  /* ft */
           NULL,  /* ll */
           NULL,  /* mc */
           roff_html_pre_sp,  /* sp */
           NULL,  /* ta */
           NULL,  /* ti */
 };  };
   
   
Line 37  void
Line 48  void
 roff_html_pre(struct html *h, const struct roff_node *n)  roff_html_pre(struct html *h, const struct roff_node *n)
 {  {
         assert(n->tok < ROFF_MAX);          assert(n->tok < ROFF_MAX);
         (*roff_html_pre_acts[n->tok])(h, n);          if (roff_html_pre_acts[n->tok] != NULL)
                   (*roff_html_pre_acts[n->tok])(h, n);
 }  }
   
 static void  static void
 roff_html_pre_br(ROFF_HTML_ARGS)  roff_html_pre_br(ROFF_HTML_ARGS)
 {  {
         print_otag(h, TAG_DIV, "");          struct tag      *t;
   
           t = print_otag(h, TAG_DIV, "");
           print_text(h, "\\~");  /* So the div isn't empty. */
           print_tagq(h, t);
   }
   
   static void
   roff_html_pre_ce(ROFF_HTML_ARGS)
   {
           for (n = n->child->next; n != NULL; n = n->next) {
                   if (n->type == ROFFT_TEXT) {
                           if (n->flags & NODE_LINE)
                                   roff_html_pre_br(h, n);
                           print_text(h, n->string);
                   } else
                           roff_html_pre(h, n);
           }
           roff_html_pre_br(h, n);
   }
   
   static void
   roff_html_pre_sp(ROFF_HTML_ARGS)
   {
           struct roffsu    su;
   
           SCALE_VS_INIT(&su, 1);
           if ((n = n->child) != NULL) {
                   if (a2roffsu(n->string, &su, SCALE_VS) == NULL)
                           su.scale = 1.0;
                   else if (su.scale < 0.0)
                           su.scale = 0.0;
           }
           print_otag(h, TAG_DIV, "suh", &su);
         print_text(h, "\\~");  /* So the div isn't empty. */          print_text(h, "\\~");  /* So the div isn't empty. */
 }  }

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.8

CVSweb