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

Diff for /mandoc/html.c between version 1.101 and 1.104

version 1.101, 2010/06/07 10:52:44 version 1.104, 2010/07/06 11:10:53
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *   *
  * 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 484  print_doctype(struct html *h)
Line 484  print_doctype(struct html *h)
   
   
 void  void
 print_text(struct html *h, const char *p)  print_text(struct html *h, const char *word)
 {  {
   
         if (*p && 0 == *(p + 1))          if (word[0] && '\0' == word[1])
                 switch (*p) {                  switch (word[0]) {
                 case('.'):                  case('.'):
                         /* FALLTHROUGH */                          /* FALLTHROUGH */
                 case(','):                  case(','):
Line 514  print_text(struct html *h, const char *p)
Line 514  print_text(struct html *h, const char *p)
         if ( ! (h->flags & HTML_NOSPACE))          if ( ! (h->flags & HTML_NOSPACE))
                 putchar(' ');                  putchar(' ');
   
         assert(p);          assert(word);
         if ( ! print_encode(h, p, 0))          if ( ! print_encode(h, word, 0))
                 h->flags &= ~HTML_NOSPACE;                  h->flags &= ~HTML_NOSPACE;
   
         /*          /*
          * Note that we don't process the pipe: the parser sees it as           * Note that we don't process the pipe: the parser sees it as
          * punctuation, but we don't in terms of typography.           * punctuation, but we don't in terms of typography.
          */           */
         if (*p && 0 == *(p + 1))          if (word[0] && '\0' == word[1])
                 switch (*p) {                  switch (word[0]) {
                 case('('):                  case('('):
                         /* FALLTHROUGH */                          /* FALLTHROUGH */
                 case('['):                  case('['):
Line 718  bufcat_su(struct html *h, const char *p, const struct 
Line 718  bufcat_su(struct html *h, const char *p, const struct 
                 break;                  break;
         }          }
   
         if (su->pt)          /*
                 buffmt(h, "%s: %f%s;", p, v, u);           * XXX: the CSS spec isn't clear as to which types accept
         else           * integer or real numbers, so we just make them all decimals.
                 /* LINTED */           */
                 buffmt(h, "%s: %d%s;", p, (int)v, u);          buffmt(h, "%s: %.2f%s;", p, v, u);
 }  }
   
   

Legend:
Removed from v.1.101  
changed lines
  Added in v.1.104

CVSweb