From 92debe4b9e4bd578290cb24375693d644acb1744 Mon Sep 17 00:00:00 2001 From: Owen McGrath <7798336+owm111@users.noreply.github.com> Date: Sat, 24 Aug 2019 11:41:25 -0500 Subject: Change optMetadataFile type from Maybe to List (#5702) Changed optMetadataFile from `Maybe FilePath` to `[FilePath]`. This allows for multiple YAML metadata files to be added. The new default value has been changed from `Nothing` to `[]`. To account for this change in `Text.Pandoc.App`, `metaDataFromFile` now operates on two `mapM` calls (for `readFileLazy` and `yamlToMeta`) and a fold. Added a test (command/5700.md) which tests this functionality and updated MANUAL.txt, as per the contributing guidelines. With the current behavior, using `foldr1 (<>)`, values within files specified first will be used over those in later files. (If the reverse of this behavior would be preferred, it should be fixed by changing foldr1 to foldl1.) --- test/command/5700.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test/command/5700.md (limited to 'test/command/5700.md') diff --git a/test/command/5700.md b/test/command/5700.md new file mode 100644 index 000000000..64f99c862 --- /dev/null +++ b/test/command/5700.md @@ -0,0 +1,6 @@ +``` +% pandoc -t native -s --metadata-file command/5700-metadata-file-1.yml --metadata-file command/5700-metadata-file-2.yml +^D +Pandoc (Meta {unMeta = fromList [("desc",MetaInlines [Str "Both",Space,Str "of",Space,Str "these",Space,Str "files",Space,Str "should",Space,Str "be",Space,Str "loaded."]),("title",MetaInlines [Str "Multiple",Space,Str "metadata",Space,Str "files",Space,Str "test"])]}) +[] +``` -- cgit v1.2.3