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

Diff for /mandoc/mdoc_term.c between version 1.275 and 1.277

version 1.275, 2014/08/06 15:09:05 version 1.277, 2014/08/17 08:37:11
Line 16 
Line 16 
  * 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.
  */   */
 #ifdef HAVE_CONFIG_H  
 #include "config.h"  #include "config.h"
 #endif  
   
 #include <sys/types.h>  #include <sys/types.h>
   
Line 808  termp_it_pre(DECL_ARGS)
Line 806  termp_it_pre(DECL_ARGS)
                  * the "overstep" effect in term_flushln() and treat                   * the "overstep" effect in term_flushln() and treat
                  * this as a `-ohang' list instead.                   * this as a `-ohang' list instead.
                  */                   */
                 if (n->next->child &&                  if (NULL != n->next &&
                     (MDOC_Bl == n->next->child->tok ||                          NULL != n->next->child &&
                      MDOC_Bd == n->next->child->tok))                          (MDOC_Bl == n->next->child->tok ||
                            MDOC_Bd == n->next->child->tok))
                         break;                          break;
   
                 p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;                  p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
Line 864  termp_it_pre(DECL_ARGS)
Line 863  termp_it_pre(DECL_ARGS)
                  * don't want to recalculate rmargin and offsets when                   * don't want to recalculate rmargin and offsets when
                  * using `Bd' or `Bl' within `-hang' overstep lists.                   * using `Bd' or `Bl' within `-hang' overstep lists.
                  */                   */
                 if (MDOC_HEAD == n->type && n->next->child &&                  if (MDOC_HEAD == n->type &&
                     (MDOC_Bl == n->next->child->tok ||                          NULL != n->next &&
                      MDOC_Bd == n->next->child->tok))                          NULL != n->next->child &&
                           (MDOC_Bl == n->next->child->tok ||
                            MDOC_Bd == n->next->child->tok))
                         break;                          break;
                 /* FALLTHROUGH */                  /* FALLTHROUGH */
         case LIST_bullet:          case LIST_bullet:
Line 1029  termp_nm_pre(DECL_ARGS)
Line 1030  termp_nm_pre(DECL_ARGS)
         if (MDOC_HEAD == n->type)          if (MDOC_HEAD == n->type)
                 synopsis_pre(p, n->parent);                  synopsis_pre(p, n->parent);
   
         if (MDOC_HEAD == n->type && n->next->child) {          if (MDOC_HEAD == n->type &&
                   NULL != n->next && NULL != n->next->child) {
                 p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;                  p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
                 p->trailspace = 1;                  p->trailspace = 1;
                 p->rmargin = p->offset + term_len(p, 1);                  p->rmargin = p->offset + term_len(p, 1);
Line 1057  termp_nm_post(DECL_ARGS)
Line 1059  termp_nm_post(DECL_ARGS)
   
         if (MDOC_BLOCK == n->type) {          if (MDOC_BLOCK == n->type) {
                 p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);                  p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
         } else if (MDOC_HEAD == n->type && n->next->child) {          } else if (MDOC_HEAD == n->type &&
                   NULL != n->next && NULL != n->next->child) {
                 term_flushln(p);                  term_flushln(p);
                 p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);                  p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
                 p->trailspace = 0;                  p->trailspace = 0;
Legend:
Removed from v.1.275  
changed lines
  Added in v.1.277
CVSweb