[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.4 and 1.21

version 1.4, 2017/05/07 17:31:45 version 1.21, 2020/06/22 19:20:40
Line 1 
Line 1 
 /*      $OpenBSD$ */  /* $Id$ */
 /*  /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2014, 2017, 2018, 2019 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 15 
Line 15 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */   */
   #include "config.h"
   
 #include <sys/types.h>  #include <sys/types.h>
   
 #include <assert.h>  #include <assert.h>
 #include <stddef.h>  #include <stdio.h>
   #include <string.h>
   
   #include "mandoc.h"
 #include "roff.h"  #include "roff.h"
 #include "out.h"  #include "out.h"
 #include "html.h"  #include "html.h"
Line 29 
Line 33 
 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_fi(ROFF_HTML_ARGS);
   static  void      roff_html_pre_ft(ROFF_HTML_ARGS);
   static  void      roff_html_pre_nf(ROFF_HTML_ARGS);
 static  void      roff_html_pre_sp(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 */
         NULL,  /* ft */          roff_html_pre_ce,  /* ce */
           roff_html_pre_fi,  /* fi */
           roff_html_pre_ft,  /* ft */
         NULL,  /* ll */          NULL,  /* ll */
           NULL,  /* mc */
           roff_html_pre_nf,  /* nf */
           NULL,  /* po */
           roff_html_pre_ce,  /* rj */
         roff_html_pre_sp,  /* sp */          roff_html_pre_sp,  /* sp */
         NULL,  /* ta */          NULL,  /* ta */
           NULL,  /* ti */
 };  };
   
   
Line 51  roff_html_pre(struct html *h, const struct roff_node *
Line 66  roff_html_pre(struct html *h, const struct roff_node *
 static void  static void
 roff_html_pre_br(ROFF_HTML_ARGS)  roff_html_pre_br(ROFF_HTML_ARGS)
 {  {
         print_otag(h, TAG_DIV, "");          print_otag(h, TAG_BR, "");
         print_text(h, "\\~");  /* So the div isn't empty. */  
 }  }
   
 static void  static void
 roff_html_pre_sp(ROFF_HTML_ARGS)  roff_html_pre_ce(ROFF_HTML_ARGS)
 {  {
         struct roffsu    su;          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);
   }
   
         SCALE_VS_INIT(&su, 1);  static void
         if ((n = n->child) != NULL) {  roff_html_pre_fi(ROFF_HTML_ARGS)
                 if (a2roffsu(n->string, &su, SCALE_VS) == 0)  {
                         su.scale = 1.0;          if (html_fillmode(h, TOKEN_NONE) == ROFF_fi)
                 else if (su.scale < 0.0)                  print_otag(h, TAG_BR, "");
                         su.scale = 0.0;  }
   
   static void
   roff_html_pre_ft(ROFF_HTML_ARGS)
   {
           const char      *cp;
   
           cp = n->child->string;
           html_setfont(h, mandoc_font(cp, (int)strlen(cp)));
   }
   
   static void
   roff_html_pre_nf(ROFF_HTML_ARGS)
   {
           if (html_fillmode(h, TOKEN_NONE) == ROFF_nf)
                   print_otag(h, TAG_BR, "");
   }
   
   static void
   roff_html_pre_sp(ROFF_HTML_ARGS)
   {
           if (html_fillmode(h, TOKEN_NONE) == ROFF_nf) {
                   h->col++;
                   print_endline(h);
           } else {
                   html_close_paragraph(h);
                   print_otag(h, TAG_P, "c", "Pp");
         }          }
         print_otag(h, TAG_DIV, "suh", &su);  
         print_text(h, "\\~");  /* So the div isn't empty. */  
 }  }

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.21

CVSweb