From cb57eb07d65e05b543cf3fef46a1622138609160 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 07 Jul 2019 11:53:18 -0400 Subject: [PATCH] Revert "fix enforcement of 1-step indentation" This reverts commit 8c537aa2956a55fe341e1d48110ae6985ada7e5f. --- src/main.c | 9 ++++----- test/indent | 11 ----------- diff --git a/src/main.c b/src/main.c index 688b544d9c09803f478cbaa6c704edb1a2ffe741..2508a7f0ded51471729b78f7247305adf2f37f3a 100644 --- a/src/main.c +++ b/src/main.c @@ -286,12 +286,9 @@ while ((ch = parser_getch(p)) == '\t') { ++i; } parser_pushch(p, ch); - if ((ch == '\n' || ch == UTF8_INVALID) && *indent != 0) { - // Don't change indent when we encounter empty lines or EOF + if (ch == '\n' && *indent != 0) { + // Don't change indent when we encounter empty lines return *indent; - } - if (abs(i - *indent) > 1) { - parser_fatal(p, "Changed indentation by an amount greater than 1"); } if (write) { if (i < *indent) { @@ -300,6 +297,8 @@ roff_macro(p, "RE", NULL); } } else if (i == *indent + 1) { fprintf(p->output, ".RS 4\n"); + } else if (i != *indent && ch == '\t') { + parser_fatal(p, "Indented by an amount greater than 1"); } } *indent = i; diff --git a/test/indent b/test/indent index 0df281d15ba536518c0e24ff5e8467cdb028696c..087e30c9aaf450575d75247258a2a547e7efe8fd 100755 --- a/test/indent +++ b/test/indent @@ -19,14 +19,3 @@ Indented one level Not indented EOF end 0 - -begin "Disallows indentation changes > 1" -scdoc </dev/null -test(8) - -Not indented - Indented one level - Indented three levels -Not indented -EOF -end 1 -- 2.48.1