* src/syn/BoxedSdf2.sdf: Fix layout ambiguities.

	* src/pack-boxedsdf/pack-boxedsdf.str: Use the sglr -s option.

	* src/parser/parse-boxedsdf-module.str,
	* src/parser/parse-boxedsdf-definition.str: New.
	* src/parser/parse-boxedsdf.str: Delete.

	* src/parser/Makefile.am,
	* test/defs.in, test/merge.test: Update.