Fix bugs #6078 and #9364

[lyx.git] / src / support / lstrings.h

diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 85ea79b8df54ffe7f086956a6292f5cd9686207d..395e18e04d3f633e867a740cfa132faf2c42233c 100644 (file)
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -18,7 +18,6 @@
 
 #include "support/docstring.h"
 
-#include <string>
 #include <vector>
 
 
@@ -29,6 +28,9 @@ namespace support {
 /// Does not depend on the locale.
 int compare_no_case(docstring const & s, docstring const & s2);
 
+/// Compare \p s and \p s2 using the collating rules of the current locale.
+int compare_locale(docstring const & s, docstring const & s2);
+
 /// Compare \p s and \p s2, ignoring the case of ASCII characters only.
 int compare_ascii_no_case(std::string const & s, std::string const & s2);
 
@@ -45,7 +47,9 @@ bool isStrUnsignedInt(std::string const & str);
 bool isStrDbl(std::string const & str);
 
 /// does the string contain a digit?
-bool hasDigit(docstring const & str);
+bool hasDigitASCII(docstring const & str);
+
+bool isHexChar(char_type);
 
 bool isHex(docstring const & str);
 
@@ -83,6 +87,12 @@ char_type lowercase(char_type c);
 /// Does not depend on the locale.
 char_type uppercase(char_type c);
 
+/// Checks if the supplied character is lower-case
+bool isLowerCase(char_type ch);
+
+/// Checks if the supplied character is upper-case
+bool isUpperCase(char_type ch);
+
 /// same as lowercase(), but ignores locale
 std::string const ascii_lowercase(std::string const &);
 docstring const ascii_lowercase(docstring const &);
@@ -90,11 +100,21 @@ docstring const ascii_lowercase(docstring const &);
 /// Changes the case of \p s to lowercase.
 /// Does not depend on the locale.
 docstring const lowercase(docstring const & s);
+// Currently unused, but the code is there if needed.
+// std::string const lowercase(std::string const & s);
 
 /// Changes the case of \p s to uppercase.
 /// Does not depend on the locale.
 docstring const uppercase(docstring const & s);
 
+/// Returns the superscript of \p c or \p c if no superscript exists.
+/// Does not depend on the locale.
+char_type superscript(char_type c);
+
+/// Returns the subscript of \p c or \p c if no subscript exists.
+/// Does not depend on the locale.
+char_type subscript(char_type c);
+
 /// Does str start with c?
 bool prefixIs(docstring const & str, char_type c);
 
@@ -173,9 +193,20 @@ std::string const subst(std::string const & a,
 docstring const subst(docstring const & a,
                docstring const & oldstr, docstring const & newstr);
 
+/// Count all occurences of char \a chr inside \a str
+int count_char(std::string const & str, char chr);
+
 /// Count all occurences of char \a chr inside \a str
 int count_char(docstring const & str, docstring::value_type chr);
 
+/** Count all occurences of binary chars inside \a str.
+    It is assumed that \a str is utf-8 encoded and that a binary char
+    belongs to the unicode class names Zl, Zp, Cc, Cf, Cs, Co, or Cn
+    (excluding white space characters such as '\t', '\n', '\v', '\f', '\r').
+    See http://www.unicode.org/Public/6.2.0/ucd/UnicodeData.txt
+*/
+int count_bin_chars(std::string const & str);
+
 /** Trims characters off the end and beginning of a string.
     \code
     trim("ccabccc", "c") == "ab".
@@ -213,6 +244,7 @@ docstring const ltrim(docstring const & a, char const * p = " ");
     will be the whole of the string if no delimiter is found.
     The return value is what follows delim, if anything. So the return
     value is the null string if no delimiter is found.
+    'a' and 'piece' must be different variables.
     Examples:
     \code
     s1= "a;bc"; s2= ""
@@ -227,6 +259,7 @@ std::string const split(std::string const & a, char delim);
 
 /// Same as split but uses the last delim.
 std::string const rsplit(std::string const & a, std::string & piece, char delim);
+docstring const rsplit(docstring const & a, docstring & piece, char_type delim);
 docstring const rsplit(docstring const & a, char_type delim);
 
 /// Escapes non ASCII chars and other problematic characters that cause
@@ -269,6 +302,15 @@ docstring const getStringFromVector(std::vector<docstring> const & vec,
 /// found, else -1. The last item in \p str must be "".
 int findToken(char const * const str[], std::string const & search_token);
 
+
+/// Format a floating point number with at least 6 siginificant digits, but
+/// without scientific notation.
+/// Scientific notation would be invalid in some contexts, such as lengths for
+/// LaTeX. Simply using std::ostream with std::fixed would produce results
+/// like "1000000.000000", and precision control would not be that easy either.
+std::string formatFPNumber(double);
+
+
 template <class Arg1>
 docstring bformat(docstring const & fmt, Arg1);