Slight rearrangement

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 1b2a88d1366cfe9a884d557bbbf5c1d01472de0f..458a9ee1eac354c603f79c9b5e9c40ee4db9a55d 100644 (file)
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -68,6 +68,7 @@
 0x00a5 "\\textyen"                "textcomp" "force=cp862;cp1255;cp1256;euc-jp;euc-jp-platex;jis;shift-jis-platex" "\\yen" "amssymb" # YEN SIGN
 0x00a6 "\\textbrokenbar"          "textcomp" "force=cp1255;cp1256;iso8859-7;euc-jp;euc-jp-platex;utf8-platex" # BROKEN BAR
 0x00a7 "\\textsection"            "textcomp" "force=cp1255;cp1256;iso8859-7;euc-cn;euc-jp;euc-kr;euc-tw;gbk;jis;shift-jis-platex" "\\mathsection" "" # SECTION SIGN
+0x00a7 "\\S" ""
 0x00a8 "\\textasciidieresis"      "textcomp" "force=cp1255;cp1256;iso8859-7;euc-cn;euc-jp;euc-kr;gbk;jis;shift-jis-platex" # DIAERESIS
 0x00a9 "\\textcopyright"          "textcomp" "force=cp1255;cp1256;koi8-u;iso8859-7;euc-jp;euc-jp-platex;utf8-platex" # COPYRIGHT SIGN
 0x00a9 "\\copyright" ""

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index d0610efb2e2af646dd60f2355dab5d65744bfa42..dab24b72ddecf3c2c6eb0a8ba170cab1cf905e92 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -459,13 +459,13 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
                // the prefix of some command in the unicodesymbols file
                docstring subcmd = cmd.substr(i, j - i + 1);
 
-               CharInfoMap::const_iterator it = unicodesymbols.begin();
                // First part of subcmd which might be a combining character
                docstring combcmd = (m == j) ? docstring() : cmd.substr(i, m - i + 1);
                // The combining character of combcmd if it exists
-               CharInfoMap::const_iterator combining = uniend;
                size_t unicmd_size = 0;
                char_type c = 0;
+               CharInfoMap::const_iterator it = unicodesymbols.begin();
+               CharInfoMap::const_iterator combining = uniend;
                for (; it != uniend; ++it) {
                        if (it->second.deprecated())
                                continue;