- fixed encode_xml_id() allowing some non-alphabetical characters like µ

pwiz/analysis/spectrum_processing/SpectrumListFactory.cpp

@@ -1188,8 +1188,9 @@ UsageInfo usage_titleMaker={"<format_string>","This filter adds or replaces spec
     "   \"<Id>\" - prints the spectrum's nativeID\n"
     "   \"<SourcePath>\" - prints the path of the spectrum's source data\n"
     "   \"<ScanNumber>\" - if the nativeID can be represented as a single number, prints that number, else index+1\n"
+    "   \"<IonMobility>\" - for the first scan of a spectrum, prints the \"ion mobility drift time\" or \"inverse reduced ion mobility\" value\n"
     "   \"<ActivationType>\" - for the first precursor, prints the spectrum's \"dissociation method\" value\n"
-    "   \"<IsolationMz>\" - for the first precursor, prints the the spectrum's \"isolation target m/z\" value\n"
+    "   \"<IsolationMz>\" - for the first precursor, prints the spectrum's \"isolation target m/z\" value\n"
     "   \"<PrecursorSpectrumId>\" - prints the nativeID of the spectrum of the first precursor\n"
     "   \"<SelectedIonMz>\" - prints the m/z value of the first selected ion of the first precursor\n"
     "   \"<ChargeState>\" - prints the charge state for the first selected ion of the first precursor\n"

pwiz/utility/minimxml/XMLWriter.cpp

@@ -340,7 +340,7 @@ namespace {
 //       but here we'll just encode any non-ASCII value.
 bool isNCNameStartChar(char& c)
 {
-    return std::isalpha(c, std::locale::classic()) || c == '_';
+    return ((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) || c == '_';
 }
 
 bool isNCNameChar(char& c)

pwiz_tools/commandline/msconvert.cpp

@@ -109,7 +109,7 @@ string Config::outputFilename(const string& filename, const MSData& msd) const
     // this list is for Windows; it's a superset of the POSIX list
     string illegalFilename = "\\/*:?<>|\"";
     for(char& c : runId)
-        if (c < 0x20 || c == 0x7F || illegalFilename.find(c) != string::npos)
+        if ((c >= 0 && c < 0x20) || c == 0x7F || illegalFilename.find(c) != string::npos)
             c = '_';
 
     bfs::path newFilename = runId + extension;