 @@ -1,14 +1,14 @@
-/*	$NetBSD: io.c,v 1.211 2023/06/10 07:48:55 rillig Exp $	*/
+/*	$NetBSD: io.c,v 1.212 2023/06/10 07:53:00 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -28,27 +28,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: io.c,v 1.211 2023/06/10 07:48:55 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.212 2023/06/10 07:53:00 rillig Exp $");
 #include <stdio.h>
 #include "indent.h"
 struct buffer inp;
 const char *inp_p;
 struct output_state out;
 enum indent_enabled indent_enabled;
 static int out_ind;		/* width of the line that is being written */
 static unsigned wrote_newlines = 2;	/* 0 in the middle of a line, 1 after a
 					 * single '\n', > 1 means there were (n
 @@ -312,78 +312,81 @@ output_line_comment(void)
 	if (out_ind > target_ind)
 		write_newline();
 	while (com.s + com.len > p && ch_isspace(com.s[com.len - 1]))
 		com.len--;
 	write_indent(target_ind);
 	write_range(p, com.len - (size_t)(p - com.s));
 	ps.comment_delta = ps.n_comment_delta;
+}
 static void
 output_line_indented(void)
+{
 	if (lab.len == 0 && code.len == 0 && com.len == 0)
 		out.line_kind = lk_blank;
 	if (want_blank_line() && wrote_newlines < 2
 	    && out.line_kind != lk_blank)
 		write_newline();
 	/* This kludge aligns function definitions correctly. */
 	if (ps.ind_level == 0)
 		ps.in_stmt_cont = false;
 	if (opt.blank_line_after_decl && ps.declaration == decl_end
 	    && ps.psyms.top > 1) {
 		ps.declaration = decl_no;
 		ps.blank_line_after_decl = true;
+	}
 	if (opt.swallow_optional_blanklines
 	    && out.line_kind == lk_blank
 	    && is_blank_line_optional())
 		return;
 	if (lab.len > 0)
 		output_line_label();
 	if (code.len > 0)
 		output_line_code();
 	if (com.len > 0)
 		output_line_comment();
 	write_newline();
 	out.prev_line_kind = out.line_kind;
+}
 /*
  * Write a line of formatted source to the output file. The line consists of
  * the label, the code and the comment.
  */
 void
 output_line(void)
+{
 	debug_blank_line();
 	debug_printf("%s", __func__);
 	debug_buffers();
-	if (indent_enabled == indent_on) {
+	if (indent_enabled == indent_on)
-		if (lab.len == 0 && code.len == 0 && com.len == 0)
+		output_line_indented();
-			out.line_kind = lk_blank;
+	else if (indent_enabled == indent_last_off_line) {
 		if (want_blank_line() && wrote_newlines < 2
 		    && out.line_kind != lk_blank)
 			write_newline();
 		/* This kludge aligns function definitions correctly. */
 		if (ps.ind_level == 0)
 			ps.in_stmt_cont = false;
 		if (opt.blank_line_after_decl && ps.declaration == decl_end
 		    && ps.psyms.top > 1) {
 			ps.declaration = decl_no;
 			ps.blank_line_after_decl = true;
 		if (opt.swallow_optional_blanklines
 		    && out.line_kind == lk_blank
 		    && is_blank_line_optional())
 			goto prepare_next_line;
 		if (lab.len > 0)
 			output_line_label();
 		if (code.len > 0)
 			output_line_code();
 		if (com.len > 0)
 			output_line_comment();
 		write_newline();
 		out.prev_line_kind = out.line_kind;
 	if (indent_enabled == indent_last_off_line) {
 		indent_enabled = indent_on;
 		write_range(out.indent_off_text.s, out.indent_off_text.len);
 		out.indent_off_text.len = 0;
+	}
 prepare_next_line:
 	lab.len = 0;
 	code.len = 0;
 	com.len = 0;
 	ps.line_has_decl = ps.in_decl;
 	ps.line_has_func_def = false;
 	// XXX: don't reset in_stmt_cont here; see process_colon_question.
 	ps.in_stmt_cont = ps.in_stmt_or_decl
 	    && !ps.in_decl && ps.init_level == 0;
 	ps.decl_indent_done = false;
 	if (ps.extra_expr_indent == eei_last)
 		ps.extra_expr_indent = eei_no;
 	if (!(ps.psyms.sym[ps.psyms.top] == psym_if_expr_stmt_else