The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 9027802114492bb2cf8b43fd145c33ccc49e3b92 Author: Uwe Stöhr <[email protected]> Date: Mon Feb 18 14:07:13 2013 +0100 tex2lyx: a fix for the \tone support - the package tone must explicitly be registered because there can be a single tone that is not found via unicodesymbols diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index d0427c2..4906925 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -294,7 +294,7 @@ char const * const known_tipa_marks[] = {"textsubwedge", "textsubumlaut", "texthighrise", "textlowrise", "textrisefall", "textsyllabic", "textsubring", 0}; -/// tones that need special handling +/// TIPA tones that need special handling char const * const known_tones[] = {"15", "51", "45", "12", "454", 0}; // string to store the float type to be able to determine the type of subfloats @@ -3278,7 +3278,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, else if (t.cs() == "tone" ) { context.check_layout(os); - // try to see whether the string is in unicodesymbols + // register the tone package + preamble.registerAutomaticallyLoadedPackage("tone"); string content = trimSpaceAndEol(p.verbatim_item()); string command = t.asInput() + "{" + content + "}"; // some tones can be detected by unicodesymbols, some need special code @@ -3286,6 +3287,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, os << "\\IPAChar " << command << "\n"; continue; } + // try to see whether the string is in unicodesymbols bool termination; docstring rem; set<string> req; @@ -3298,9 +3300,6 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, << ", result is " << to_utf8(s) << "+" << to_utf8(rem) << endl; os << to_utf8(s); - // thiw will register the package "tone" - for (set<string>::const_iterator it = req.begin(); it != req.end(); ++it) - preamble.registerAutomaticallyLoadedPackage(*it); } else // we did not find a non-ert version output_ert_inset(os, command, context); ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/text.cpp | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) hooks/post-receive -- The LyX Source Repository
