Fix output formatting.

* Makefile.am (EXTRA_DIST): Add @GRECS_DISTDOC@.
* am/grecs.m4 (GRECS_SETUP): New flag syntax-doc sets
GRECS_DISTDOC.
* doc/GRECS_SETUP.3: Update.
* src/format.c (grecs_format_node): Print value if GRECS_NODE_FLAG_VALUE
is set.
* tests/glob01.at: Update.

5 files changed, 11 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index 339b1be..229c1dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
 
 ACLOCAL_AMFLAGS = -I am
 SUBDIRS=. src @GRECS_TESTDIR@ @GRECS_DOCDIR@
-EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ gitid.h
+EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ @GRECS_DISTDOC@ gitid.h
 
 noinst_HEADERS = gitid.h
 BUILT_SOURCES = gitid.h README
diff --git a/am/grecs.m4 b/am/grecs.m4
index 5611e04..28a69e0 100644
--- a/am/grecs.m4
+++ b/am/grecs.m4
@@ -60,6 +60,7 @@ AC_DEFUN([_GRECS_SET_OPTIONS],
 #   tests              Build tests.
 #   getopt             Add getopt.m4 to the distribution
 #   git2chg            Add git2chg.awk to the distribution
+#   syntax-doc         Add doc/grecs-syntax.texi to the distribution
 #
 # The pp-setup-file argument supplies the pathname of the preprocessor
 # setup file in the source tree.  It is ignored if std-pp-setup option is
@@ -171,6 +172,7 @@ AC_DEFUN([GRECS_SETUP],[
   AC_SUBST([GRECS_README])
   AC_SUBST([GRECS_INCLUDES],['-I$(top_srcdir)/]grecsdir[src]')
   AC_SUBST([GRECS_HOST_PROJECT_INCLUDES])
+  AC_SUBST([GRECS_DISTDOC])
 
   _GRECS_OPTION_SWITCH([install],[
     LT_INIT
@@ -186,11 +188,13 @@ AC_DEFUN([GRECS_SETUP],[
     GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la']
     GRECS_CHANGELOG='#'
     GRECS_README=README.submodule
+    _GRECS_IF_OPTION_SET([syntax-doc],[GRECS_DISTDOC=doc/grecs-syntax.texi])
     AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-shared.in])
   ],[
     GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.a']
     GRECS_CHANGELOG='#'
     GRECS_README=README.submodule
+    _GRECS_IF_OPTION_SET([syntax-doc],[GRECS_DISTDOC=doc/grecs-syntax.texi])
     AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-static.in])
   ])
   AC_CONFIG_FILES(grecsdir[Makefile])
diff --git a/doc/GRECS_SETUP.3 b/doc/GRECS_SETUP.3
index 58d1ebe..0868ca7 100644
--- a/doc/GRECS_SETUP.3
+++ b/doc/GRECS_SETUP.3
@@ -87,6 +87,10 @@ in \fIdir\fR/build-aux.
 .B git2chg
 Add \fBgit2chg.awk\fR to the distributed tarball. The file is located
 in \fIdir\fR/build-aux.
+.TP
+.B syntax-doc
+Add \fBdoc/grecs-syntax.texi\fR file to the distributed tarball. Use this
+if your texinfo documentation includes that file.
 .PP
 The
 .I pp-setup-file
diff --git a/src/format.c b/src/format.c
index a8f758d..4a0d759 100644
--- a/src/format.c
+++ b/src/format.c
@@ -306,8 +306,7 @@ grecs_format_node(struct grecs_node *node, int flags,
 			grecs_format_node_path(node, flags, clos);
 			delim_str = ": ";
 		}
-		if (node->type == grecs_node_stmt &&
-		    (flags & GRECS_NODE_FLAG_VALUE)) {
+		if (flags & GRECS_NODE_FLAG_VALUE) {
 			if (delim_str)
 				clos->fmtfun(delim_str, clos->data);
 			grecs_format_value(node->v.value, flags, clos);
diff --git a/tests/glob01.at b/tests/glob01.at
index ade8ae5..a0e2e63 100644
--- a/tests/glob01.at
+++ b/tests/glob01.at
@@ -19,7 +19,7 @@ AT_KEYWORDS([peek peek05 glob glob01])
 
 AT_CHECK([gcfpeek -nodesc -match $abs_srcdir/gcf1.conf .logging.*|sed 's/ *$//'],
 [0],
-[.logging
+[.logging:
 .logging.syslog: "yes"
 .logging.facility: "mail"
 ])