[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.7 and 1.15

version 1.7, 2017/06/06 15:01:04 version 1.15, 2018/12/16 00:17:02
Line 1 
Line 1 
 /*      $Id$ */  /*      $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 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 18 
Line 18 
 #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 30  typedef void (*roff_html_pre_fp)(ROFF_HTML_ARGS);
Line 32  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_ce(ROFF_HTML_ARGS);
   static  void      roff_html_pre_ft(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 */
         roff_html_pre_ce,  /* ce */          roff_html_pre_ce,  /* ce */
         NULL,  /* ft */          roff_html_pre_ft,  /* ft */
         NULL,  /* ll */          NULL,  /* ll */
         NULL,  /* mc */          NULL,  /* mc */
           NULL,  /* po */
           roff_html_pre_ce,  /* rj */
         roff_html_pre_sp,  /* sp */          roff_html_pre_sp,  /* sp */
         NULL,  /* ta */          NULL,  /* ta */
         NULL,  /* ti */          NULL,  /* ti */
Line 55  roff_html_pre(struct html *h, const struct roff_node *
Line 60  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)
 {  {
         struct tag      *t;          print_otag(h, TAG_BR, "");
   
         t = print_otag(h, TAG_DIV, "");  
         print_text(h, "\\~");  /* So the div isn't empty. */  
         print_tagq(h, t);  
 }  }
   
 static void  static void
Line 77  roff_html_pre_ce(ROFF_HTML_ARGS)
Line 78  roff_html_pre_ce(ROFF_HTML_ARGS)
 }  }
   
 static void  static void
 roff_html_pre_sp(ROFF_HTML_ARGS)  roff_html_pre_ft(ROFF_HTML_ARGS)
 {  {
         struct roffsu    su;          const char      *cp;
   
         SCALE_VS_INIT(&su, 1);          cp = n->child->string;
         if ((n = n->child) != NULL) {          print_metaf(h, mandoc_font(cp, (int)strlen(cp)));
                 if (a2roffsu(n->string, &su, SCALE_VS) == 0)  }
                         su.scale = 1.0;  
                 else if (su.scale < 0.0)  static void
                         su.scale = 0.0;  roff_html_pre_sp(ROFF_HTML_ARGS)
         }  {
         print_otag(h, TAG_DIV, "suh", &su);          print_paragraph(h);
         print_text(h, "\\~");  /* So the div isn't empty. */  
 }  }

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.15

CVSweb