From: Lars Gullik Bjønnes Date: Fri, 6 Jul 2001 19:56:32 +0000 (+0000) Subject: fix stuff X-Git-Tag: 1.6.10~21124 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e2b924a0fe67af2598bad5302452c4f248277656;p=features.git fix stuff git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2196 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/po/POTFILES.in b/po/POTFILES.in index e82c0acbe3..300a18a53d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,8 +10,8 @@ src/CutAndPaste.C src/debug.C src/exporter.C src/ext_l10n.h -src/figureForm.C src/figure_form.C +src/figureForm.C src/FontLoader.C src/frontends/controllers/ButtonController.h src/frontends/controllers/character.C @@ -89,67 +89,67 @@ src/frontends/qt2/paragraphdlgimpl.C src/frontends/qt2/tabularcreatedlgimpl.C src/frontends/xforms/combox.C src/frontends/xforms/FileDialog.C -src/frontends/xforms/FormBibitem.C src/frontends/xforms/form_bibitem.C -src/frontends/xforms/FormBibtex.C +src/frontends/xforms/FormBibitem.C src/frontends/xforms/form_bibtex.C +src/frontends/xforms/FormBibtex.C src/frontends/xforms/form_browser.C -src/frontends/xforms/FormCharacter.C src/frontends/xforms/form_character.C -src/frontends/xforms/FormCitation.C +src/frontends/xforms/FormCharacter.C src/frontends/xforms/form_citation.C -src/frontends/xforms/FormCopyright.C +src/frontends/xforms/FormCitation.C src/frontends/xforms/form_copyright.C -src/frontends/xforms/FormCredits.C +src/frontends/xforms/FormCopyright.C src/frontends/xforms/form_credits.C -src/frontends/xforms/FormDocument.C +src/frontends/xforms/FormCredits.C src/frontends/xforms/form_document.C -src/frontends/xforms/FormError.C +src/frontends/xforms/FormDocument.C src/frontends/xforms/form_error.C -src/frontends/xforms/FormExternal.C +src/frontends/xforms/FormError.C src/frontends/xforms/form_external.C -src/frontends/xforms/FormFiledialog.C +src/frontends/xforms/FormExternal.C src/frontends/xforms/form_filedialog.C -src/frontends/xforms/FormGraphics.C +src/frontends/xforms/FormFiledialog.C src/frontends/xforms/form_graphics.C -src/frontends/xforms/FormInclude.C +src/frontends/xforms/FormGraphics.C src/frontends/xforms/form_include.C -src/frontends/xforms/FormIndex.C +src/frontends/xforms/FormInclude.C src/frontends/xforms/form_index.C +src/frontends/xforms/FormIndex.C src/frontends/xforms/FormLog.C src/frontends/xforms/FormMathsBitmap.C -src/frontends/xforms/FormMathsDeco.C src/frontends/xforms/form_maths_deco.C -src/frontends/xforms/FormMathsDelim.C +src/frontends/xforms/FormMathsDeco.C src/frontends/xforms/form_maths_delim.C -src/frontends/xforms/FormMathsMatrix.C +src/frontends/xforms/FormMathsDelim.C src/frontends/xforms/form_maths_matrix.C -src/frontends/xforms/FormMathsPanel.C +src/frontends/xforms/FormMathsMatrix.C src/frontends/xforms/form_maths_panel.C -src/frontends/xforms/FormMathsSpace.C +src/frontends/xforms/FormMathsPanel.C src/frontends/xforms/form_maths_space.C -src/frontends/xforms/FormMinipage.C +src/frontends/xforms/FormMathsSpace.C src/frontends/xforms/form_minipage.C -src/frontends/xforms/FormParagraph.C +src/frontends/xforms/FormMinipage.C src/frontends/xforms/form_paragraph.C -src/frontends/xforms/FormPreamble.C +src/frontends/xforms/FormParagraph.C src/frontends/xforms/form_preamble.C -src/frontends/xforms/FormPreferences.C +src/frontends/xforms/FormPreamble.C src/frontends/xforms/form_preferences.C -src/frontends/xforms/FormPrint.C +src/frontends/xforms/FormPreferences.C src/frontends/xforms/form_print.C -src/frontends/xforms/FormRef.C +src/frontends/xforms/FormPrint.C src/frontends/xforms/form_ref.C -src/frontends/xforms/FormSearch.C +src/frontends/xforms/FormRef.C src/frontends/xforms/form_search.C -src/frontends/xforms/FormTabular.C +src/frontends/xforms/FormSearch.C src/frontends/xforms/form_tabular.C -src/frontends/xforms/FormTabularCreate.C +src/frontends/xforms/FormTabular.C src/frontends/xforms/form_tabular_create.C -src/frontends/xforms/FormToc.C +src/frontends/xforms/FormTabularCreate.C src/frontends/xforms/form_toc.C -src/frontends/xforms/FormUrl.C +src/frontends/xforms/FormToc.C src/frontends/xforms/form_url.C +src/frontends/xforms/FormUrl.C src/frontends/xforms/FormVCLog.C src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C diff --git a/src/ChangeLog b/src/ChangeLog index 3d626b1438..bb518722f4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-07-06 Lars Gullik Bjønnes + + * paragraph_pimpl.C (simpleTeXBlanks): don't go through owner_ for + own member functions + (simpleTeXSpecialChars): ditto + 2001-07-06 Juergen Vigna * a lot of files: changed the access to LyXText::status and the diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C index 74115b13f7..56b440f618 100644 --- a/src/paragraph_pimpl.C +++ b/src/paragraph_pimpl.C @@ -210,8 +210,8 @@ void Paragraph::Pimpl::simpleTeXBlanks(std::ostream & os, TexRow & texrow, { if (column > tex_code_break_column && i - && owner_->getChar(i - 1) != ' ' - && (i < owner_->size() - 1) + && getChar(i - 1) != ' ' + && (i < size() - 1) #ifndef NO_LATEX // In LaTeX mode, we don't want to // break lines since some commands @@ -223,10 +223,10 @@ void Paragraph::Pimpl::simpleTeXBlanks(std::ostream & os, TexRow & texrow, // In typewriter mode, we want to avoid // ! . ? : at the end of a line && !(font.family() == LyXFont::TYPEWRITER_FAMILY - && (owner_->getChar(i-1) == '.' - || owner_->getChar(i-1) == '?' - || owner_->getChar(i-1) == ':' - || owner_->getChar(i-1) == '!'))) { + && (getChar(i - 1) == '.' + || getChar(i - 1) == '?' + || getChar(i - 1) == ':' + || getChar(i - 1) == '!'))) { if (tex_code_break_column == 0) { // in batchmode we need LaTeX to still // see it as a space not as an extra '\n' @@ -369,8 +369,8 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf, os << c; //... but we should avoid ligatures if ((c == '>' || c == '<') - && i <= owner_->size() - 2 - && owner_->getChar(i + 1) == c) { + && i <= size() - 2 + && getChar(i + 1) == c) { //os << "\\textcompwordmark{}"; // Jean-Marc, have a look at // this. I think this works @@ -405,8 +405,8 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf, break; case '-': // "--" in Typewriter mode -> "-{}-" - if (i <= owner_->size() - 2 - && owner_->getChar(i + 1) == '-' + if (i <= size() - 2 + && getChar(i + 1) == '-' && font.family() == LyXFont::TYPEWRITER_FAMILY) { os << "-{}"; column += 2; @@ -464,46 +464,46 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf, /* idea for labels --- begin*/ // Check for "LyX" if (c == 'L' - && i <= owner_->size() - 3 + && i <= size() - 3 && font.family() != LyXFont::TYPEWRITER_FAMILY - && owner_->getChar(i + 1) == 'y' - && owner_->getChar(i + 2) == 'X') { + && getChar(i + 1) == 'y' + && getChar(i + 2) == 'X') { os << "\\LyX{}"; i += 2; column += 5; } // Check for "TeX" else if (c == 'T' - && i <= owner_->size() - 3 + && i <= size() - 3 && font.family() != LyXFont::TYPEWRITER_FAMILY - && owner_->getChar(i + 1) == 'e' - && owner_->getChar(i + 2) == 'X') { + && getChar(i + 1) == 'e' + && getChar(i + 2) == 'X') { os << "\\TeX{}"; i += 2; column += 5; } // Check for "LaTeX2e" else if (c == 'L' - && i <= owner_->size() - 7 + && i <= size() - 7 && font.family() != LyXFont::TYPEWRITER_FAMILY - && owner_->getChar(i + 1) == 'a' - && owner_->getChar(i + 2) == 'T' - && owner_->getChar(i + 3) == 'e' - && owner_->getChar(i + 4) == 'X' - && owner_->getChar(i + 5) == '2' - && owner_->getChar(i + 6) == 'e') { + && getChar(i + 1) == 'a' + && getChar(i + 2) == 'T' + && getChar(i + 3) == 'e' + && getChar(i + 4) == 'X' + && getChar(i + 5) == '2' + && getChar(i + 6) == 'e') { os << "\\LaTeXe{}"; i += 6; column += 8; } // Check for "LaTeX" else if (c == 'L' - && i <= owner_->size() - 5 + && i <= size() - 5 && font.family() != LyXFont::TYPEWRITER_FAMILY - && owner_->getChar(i + 1) == 'a' - && owner_->getChar(i + 2) == 'T' - && owner_->getChar(i + 3) == 'e' - && owner_->getChar(i + 4) == 'X') { + && getChar(i + 1) == 'a' + && getChar(i + 2) == 'T' + && getChar(i + 3) == 'e' + && getChar(i + 4) == 'X') { os << "\\LaTeX{}"; i += 4; column += 7;