John's character.C patch (bug fix).

[lyx.git] / src / frontends / controllers / ControlCharacter.C

diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C
index 4c6a1ff91ac9722ded2abfc694518854e9c3ca70..39a4cba3132e79397244c61ce7d2b581790b06ed 100644 (file)
--- a/src/frontends/controllers/ControlCharacter.C
+++ b/src/frontends/controllers/ControlCharacter.C
@@ -3,7 +3,7 @@
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  *
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <vector>
@@ -143,10 +143,6 @@ character::FONT_STATE ControlCharacter::getBar() const
 
                else if (font_->noun() != LyXFont::IGNORE)
                        return character::NOUN_TOGGLE;
-#ifndef NO_LATEX
-               else if (font_->latex() != LyXFont::IGNORE)
-                       return character::LATEX_TOGGLE;
-#endif
        }
        return character::IGNORE;
 }
@@ -159,9 +155,6 @@ void ControlCharacter::setBar(character::FONT_STATE val)
                font_->setEmph(LyXFont::IGNORE);
                font_->setUnderbar(LyXFont::IGNORE);
                font_->setNoun(LyXFont::IGNORE);
-#ifndef NO_LATEX
-               font_->setLatex(LyXFont::IGNORE);
-#endif
                break;
 
        case character::EMPH_TOGGLE:
@@ -176,19 +169,10 @@ void ControlCharacter::setBar(character::FONT_STATE val)
                font_->setNoun(LyXFont::TOGGLE);
                break;
 
-#ifndef NO_LATEX
-       case character::LATEX_TOGGLE:
-               font_->setLatex(LyXFont::TOGGLE);
-               break;
-#endif
-               
        case character::INHERIT:
                font_->setEmph(LyXFont::INHERIT);
                font_->setUnderbar(LyXFont::INHERIT);
                font_->setNoun(LyXFont::INHERIT);
-#ifndef NO_LATEX
-               font_->setLatex(LyXFont::INHERIT);
-#endif
                break;
        }
 }