From 74ad51de1a6dc74b9c253c254cccfe543d0c69b0 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 7 Mar 2018 13:01:39 +0100 Subject: Formatting --- src/frame.c | 5 +++-- src/sc_interp.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/frame.c b/src/frame.c index af95767..151a545 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1495,13 +1495,13 @@ void delete_text_from_frame(struct frame *fr, struct edit_pos p1, struct edit_po break; } printf("name is '%s'\n", sc_block_name(scblock)); + if ( (sc_block_name(scblock) != NULL) && (strcmp(sc_block_name(scblock), "newpara") == 0) ) { /* Deleting newpara block, merge the paragraphs */ merge_paragraphs_by_newpara(fr, scblock); p2.para--; - } next = sc_block_next(scblock); @@ -1530,7 +1530,8 @@ void delete_text_from_frame(struct frame *fr, struct edit_pos p1, struct edit_po printf("deleting block %p\n", p2scblock); show_sc_block(p2scblock, ""); sc_block_delete(&fr->scblocks, p2scblock); - delete_run_for_scblock(fr, fr->paras[p1.para], fr->paras[p2.para], p2scblock); + delete_run_for_scblock(fr, fr->paras[p1.para], + fr->paras[p2.para], p2scblock); } else if ( p2offs > 0 ) { printf("Partial delete\n"); printf("contents '%s'\n", sc_block_contents(p2rscblock)); diff --git a/src/sc_interp.c b/src/sc_interp.c index d2db5bf..921bf94 100644 --- a/src/sc_interp.c +++ b/src/sc_interp.c @@ -1029,10 +1029,13 @@ static int check_outputs(SCBlock *bl, SCInterpreter *scin) maybe_recurse_after(scin, child); } else if ( strcmp(name, "newpara")==0 ) { + struct frame *fr = sc_interp_get_frame(scin); Paragraph *para = last_open_para(fr); + /* Add a dummy run which we can type into */ add_run(para, bl, bl, 0, sc_interp_get_fontdesc(scin), fr->col); + set_newline_at_end(para, bl); close_last_paragraph(fr); -- cgit v1.2.3