From 2a9b15aefb842a734637f3d230936ea1b7c60096 Mon Sep 17 00:00:00 2001
From: Philip Kime <Philip@kime.org.uk>
Date: Thu, 8 Nov 2018 22:02:09 +0100
Subject: [PATCH] Fix to address #239

---
 lib/Biber.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Biber.pm b/lib/Biber.pm
index 8b1f80a5..d97fca29 100644
--- a/lib/Biber.pm
+++ b/lib/Biber.pm
@@ -311,6 +311,8 @@ sub parse_ctrlfile {
     unless (eval {$checkbuf = File::Slurper::read_text($ctrl_file_path, 'latin1')}) {
       biber_error("$ctrl_file_path is not UTF-8 or even latin1, how horrible.");
     }
+    # Write ctrl file as UTF-8
+    File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
   }
 
   $checkbuf = NFD($checkbuf);# Unicode NFD boundary
@@ -319,8 +321,6 @@ sub parse_ctrlfile {
     unlink($output) unless $output eq '-';# ignore deletion of STDOUT marker
     biber_error("$ctrl_file_path is malformed, last biblatex run probably failed. Deleted $output");
   }
-  # Write ctrl file as UTF-8
-  File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
 
   # Validate if asked to
   if (Biber::Config->getoption('validate_control')) {
scm'>log</a><a href='/guix/tree/gnu/tests/nfs.scm?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'>tree</a><a href='/guix/commit/gnu/tests/nfs.scm?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'>commit</a><a href='/guix/diff/gnu/tests/nfs.scm?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/nfs.scm'>
<input type='hidden' name='id' value='3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'>root</a>/<a href='/guix/log/gnu?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'>gnu</a>/<a href='/guix/log/gnu/tests?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'>tests</a>/<a href='/guix/log/gnu/tests/nfs.scm?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3'>nfs.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests/nfs.scm?id=3ab7e15cc5802251d3a668d6eed9a12eb6befdb3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-11-07 12:48:24 +0100'>2020-11-07</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=7286c9b1879453ea4e0a08e91cc48706d8887f37'>tests: nfs-root-fs: Use the right store file name.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-10 18:57:46 +0200'>2020-09-10</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=c41a8572efa69c5b29002245090db653f87e6da8'>tests: nfs: Improve "nfs-root-fs".</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2020-09-07 18:58:39 +0200'>2020-09-07</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=c4fe53bd118577fd45180a37f3dc68f70a510846'>tests: nfs: Improve "nfs-root-fs".</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2020-09-07 15:32:29 +0200'>2020-09-07</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=a1a39ed5a46044161a71cbe6931c7e3006a82ecb'>tests: Add "nfs-root-fs" system test.</a><span class='msg-avail'>...</span></td><td>Stefan</td></tr>
<tr><td><span title='2020-03-25 14:17:24 +0100'>2020-03-25</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=eb019af8d84ad168d6cb11c011842fb0c8303f20'>tests/nfs: Fix use of WAIT-FOR-FILE.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2020-03-16 22:58:37 +0100'>2020-03-16</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=a55472955d7dbe7385fb25a5c31b26f8ebfa6e93'>tests: nfs-server: Use marionette helper procedures.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-16 14:05:52 +0100'>2020-03-16</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=e8cec7cc120fc95b2e869a1834a01e257e0f63c8'>tests: nfs: Ensure 'rpcinfo' can be found.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-08 23:56:16 +0100'>2020-01-08</span></td><td><a href='/guix/commit/gnu/tests/nfs.scm?id=907eeac2e7d5d9c10b65038d486876e577c80d85'>services: nfs: Add nfs-service-type.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>