From 59390f9d08c71e0c39f61ce88644b5208af15881 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Fri, 4 Jul 2008 06:44:37 +0000 Subject: [PATCH] * Paragraph.cpp: - some cleanups and comments. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25438 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Paragraph.cpp | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index ff9d5b6bf1..cc0587e02d 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -802,6 +802,8 @@ void Paragraph::Private::latexSpecialChar( } if (runparams.verbatim) { + // FIXME UNICODE: This can fail if c cannot + // be encoded in the current encoding. os.put(c); return; } @@ -874,7 +876,6 @@ void Paragraph::Private::latexSpecialChar( break; default: - // LyX, LaTeX etc. if (latexSpecialPhrase(os, i, column, runparams)) return; @@ -940,32 +941,17 @@ bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream & { switch (c) { case '-': + // within \ttfamily, "--" is merged to "-" (no endash) + // so we avoid this rather irritating ligature if (i + 1 < int(text_.size()) && text_[i + 1] == '-') { - // "--" in Typewriter mode -> "-{}-" os << "-{}"; column += 2; } else os << '-'; return true; - // FIXME I assume this is hack treating typewriter as verbatim - // This should be re-evaluated eventually. - - case '\0': - return true; - -// // Those characters are not directly supported. -// case '\\': -// case '\"': -// case '$': case '&': -// case '%': case '#': case '{': -// case '}': case '_': -// case '~': -// case '^': -// case '*': case '[': -// case ' ': -// return false; - + // everything else has to be checked separately + // (depending on the encoding) default: return false; } -- 2.39.5