 @@ -1,14 +1,14 @@
-/* $NetBSD: opt_ci.c,v 1.9 2023/05/18 05:33:27 rillig Exp $ */
+/* $NetBSD: opt_ci.c,v 1.10 2023/06/09 06:36:58 rillig Exp $ */
 /*
  * Tests for the option '-ci', which controls the indentation of continuation
  * lines in statements and declarations, but only inside a function.
  */
 /*
  * Top level expressions with and without parentheses.
  */
 //indent input
 int top_level = 1 +
 ;
 int top_level = (1 +
 @@ -37,37 +37,38 @@ int		top_level = (1 +
 + (
 ));
 //indent end
 //indent run -ci2 -nlp
 int		top_level = 1 +
 ;
 int		top_level = (1 +
 + (
 ));
 //indent end
 /*
- * Since '-ci4' is half an indentation level, indent all continuations using
+ * Between 2019-04-04 and 2023-06-09, there was a special rule that prevented
- * the same level, no matter how many parentheses there are. The rationale for
+ * indentation based on the number of open parentheses, in the case that the
- * this may have been to prevent that the continuation line has the same
+ * continuation indentation is half an indentation level, maybe to prevent that
- * indentation as a follow-up statement, such as in 'if' statements.
+ * the continuation line has the same indentation as a follow-up statement,
  * such as in 'if' statements. To prevent such ambiguities, see '-eei'.
  */
 //indent run -ci4 -nlp
 int		top_level = 1 +
 ;
 int		top_level = (1 +
 + (
 ));
 //indent end
 /*
  * Declarations in functions without parentheses.
  */
 //indent input
 int
 sum(int a, int b)
+{
 	return a +
 	 b;
 	return first +
 @@ -155,41 +156,35 @@ sum(int a, int b)
 //indent run -ci2 -nlp
 int
 sum(int a, int b)
+{
 	return (a +
 	  b);
 	return (first +
 	  second + (
 	    third));
+}
 //indent end
 /*
  * Since '-ci4' is half an indentation level, indent all continuations using
  * the same level, no matter how many parentheses there are. The rationale for
  * this may have been to prevent that the continuation line has the same
  * indentation as a follow-up statement, such as in 'if' statements.
  */
 //indent run -ci4 -nlp
 int
 sum(int a, int b)
+{
 	return (a +
 	    b);
 	return (first +
 	    second + (
-	    third));
+		third));
+}
 //indent end
 //indent run -ci8 -nlp
 int
 sum(int a, int b)
+{
 	return (a +
 		b);
 	return (first +
 		second + (
 			third));
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: opt_lp.c,v 1.9 2023/06/08 20:36:35 rillig Exp $ */
+/* $NetBSD: opt_lp.c,v 1.10 2023/06/09 06:36:58 rillig Exp $ */
 /*
  * Tests for the options '-lp' and '-nlp'.
+ *
  * The option '-lp' lines up code surrounded by parentheses in continuation
  * lines. With '-lp', if a line has a left parenthesis that is not closed on
  * that line, continuation lines are lined up to start at the character
  * position just after the left parenthesis.
+ *
  * The option '-nlp' indents continuation lines with the continuation
  * indentation; see '-ci'.
  */
 @@ -56,41 +56,37 @@ example(void)
 		third_procedure(p4, p5));
 	p1 = first_procedure(second_procedure(p2,
 			p3),
 		third_procedure(p4,
 			p5));
 	p1 = first_procedure(
 		second_procedure(p2, p3),
 		third_procedure(p4, p5));
+}
 //indent end
 /*
  * XXX: Combining the options '-nlp' and '-ci4' is counterproductive as the
  * indentation does not make the nesting level of the function calls visible.
  */
 //indent run -nlp -ci4
 void
 example(void)
+{
 	p1 = first_procedure(second_procedure(p2, p3),
 	    third_procedure(p4, p5));
 	p1 = first_procedure(second_procedure(p2,
-	    p3),
+		p3),
 	    third_procedure(p4,
-	    p5));
+		p5));
 	p1 = first_procedure(
 	    second_procedure(p2, p3),
 	    third_procedure(p4, p5));
+}
 //indent end
 /*
  * Ensure that in multi-line else-if conditions, all lines are indented by the
  * correct amount.  The 'else if' condition is tricky because it has the same
  * indentation as the preceding 'if' condition.
  */

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: indent.1,v 1.32 2023/06/05 10:12:21 rillig Exp $
+.\"	$NetBSD: indent.1,v 1.33 2023/06/09 06:36:57 rillig Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\" Copyright (c) 1976 Board of Trustees of the University of Illinois.
 .\" 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
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
 .\" 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.
 .\"
 .\"	@(#)indent.1	8.1 (Berkeley) 7/1/93
 .\" $FreeBSD: head/usr.bin/indent/indent.1 334944 2018-06-11 05:35:57Z pstef $
 .\"
-.Dd June 5, 2023
+.Dd June 9, 2023
 .Dt INDENT 1
 .Os
 .Sh NAME
 .Nm indent
 .Nd indent and format C program source
 .Sh SYNOPSIS
 .Nm
 .Op Ar input-file Op Ar output-file
 .Op Fl bacc | Fl nbacc
 .Op Fl bad | Fl nbad
 .Op Fl badp | Fl nbadp
 .Op Fl bap | Fl nbap
 .Op Fl bbb | Fl nbbb
 @@ -236,28 +236,27 @@ The default is
 Enables (disables) forcing of `else's to cuddle up to the immediately preceding
 `}'.
 The default is
 .Fl \&ce .
 .It Fl \&ci Ns Ar n
 Sets the continuation indent to be
 .Ar n .
 Continuation
 lines will be indented that far from the beginning of the first line of the
 statement.
 Parenthesized expressions have extra indentation added to
 indicate the nesting, unless
 .Fl \&lp
-is in effect
+is in effect.
 or the continuation indent is exactly half of the main indent.
 .Fl \&ci
 defaults to the same value as
 .Fl i .
 .It Fl cli Ns Ar n
 Causes case labels to be indented
 .Ar n
 indentation levels to the right of the containing
 .Ic switch
 statement.
 .Fl cli0.5
 causes case labels to be indented half an indentation level.
 The
 default is

 @@ -1,14 +1,14 @@
-/*	$NetBSD: io.c,v 1.204 2023/06/08 20:36:35 rillig Exp $	*/
+/*	$NetBSD: io.c,v 1.205 2023/06/09 06:36:57 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.204 2023/06/08 20:36:35 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.205 2023/06/09 06:36:57 rillig Exp $");
 #include <stdio.h>
 #include "indent.h"
 struct buffer inp;
 const char *inp_p;
 struct output_state out;
 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
 					 * - 1) blank lines above */
 @@ -242,31 +242,27 @@ compute_code_indent(void)
 			return base_ind + opt.continuation_indent;
 		return base_ind;
+	}
 	if (opt.lineup_to_parens) {
 		if (opt.lineup_to_parens_always)
 			return paren_indent;
 		return compute_code_indent_lineup(base_ind);
+	}
 	if (ps.extra_expr_indent != eei_no)
 		return base_ind + 2 * opt.continuation_indent;
-	if (2 * opt.continuation_indent == opt.indent_size)
+	return base_ind + opt.continuation_indent * ps.line_start_nparen;
 		return base_ind + opt.continuation_indent;
 	else
 		return base_ind +
 		    opt.continuation_indent * ps.line_start_nparen;
+}
 static void
 output_line_code(void)
+{
 	int target_ind = compute_code_indent();
 	for (int i = 0; i < ps.nparen; i++) {
 		int paren_ind = ps.paren[i].indent;
 		if (paren_ind >= 0) {
 			ps.paren[i].indent = -1 - (paren_ind + target_ind);
 			debug_println(
 			    "setting paren_indents[%d] from %d to %d "
 			    "for column %d",