From 567df5d5c46eeb9c2a292ae8a52477739dcf1ddd Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 14 Feb 2003 21:37:51 +0000 Subject: [PATCH] fix display of right quote inset; fix off-by-one error in placement of error insets; fix detection of fax programs; draw arrows for symbolic skips too git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@6159 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 7 +++++++ lib/chkconfig.ltx | 2 +- lib/configure.m4 | 3 +-- src/ChangeLog | 10 ++++++++++ src/buffer.C | 12 ++++++------ src/insets/ChangeLog | 5 +++++ src/insets/insetquotes.C | 9 --------- src/text.C | 20 +++++++------------- status.13x | 6 ++++++ 9 files changed, 43 insertions(+), 31 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index f851f6d233..b1c9eb75a9 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2003-02-14 Jean-Marc Lasgouttes + + * chkconfig.ltx: information is in LaTeXConfig.lyx, not + LyXConfig.lyx + + * configure.m4: fix detection of fax programs + 2003-02-11 Jean-Marc Lasgouttes * templates/elsart.lyx: diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx index 6480354a69..3e83096080 100644 --- a/lib/chkconfig.ltx +++ b/lib/chkconfig.ltx @@ -255,6 +255,6 @@ \immediate\closeout\vars \immediate\closeout\packages \typeout{\prefix Inspection done.} -\typeout{\prefix Read the file doc/LyXConfig.lyx for more information.} +\typeout{\prefix Read the file doc/LaTeXConfig.lyx for more information.} % Get the real \end command, that has been hidden by LaTeX \@@end diff --git a/lib/configure.m4 b/lib/configure.m4 index f95f6337f2..3314188d7b 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -300,8 +300,7 @@ dnl fi # Search a GUI Fax program SEARCH_PROG([for a fax program], fax_command, kdeprintfax ksendfax) -test $fax_command = "kdeprintfax" && fax_command="kdeprintfax \$\$i" -test $fax_command = "ksendfax" && fax_command="ksendfax \$\$i" +test $fax_command != "none" && fax_command="$fax_command \$\$i" # Search for LinuxDoc support SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx) diff --git a/src/ChangeLog b/src/ChangeLog index 2d6382c281..5cd78e5a8a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2003-02-14 Jean-Marc Lasgouttes + + * buffer.C (makeLaTeXFile): fix counting of number of line feeds + in preamble + +2003-02-14 Michael Schmitt + + * text.C (drawLengthMarker): also draw an arrow marker for + symbolic lengths (medskip...) + 2003-02-11 Jean-Marc Lasgouttes * paragraph.C (asString): remove two unused variables diff --git a/src/buffer.C b/src/buffer.C index 13939de1c1..af80ecf398 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -2075,12 +2075,6 @@ void Buffer::makeLaTeXFile(ostream & os, if (!bullets_def.empty()) preamble += bullets_def + "}\n\n"; - int const nlines = - int(lyx::count(preamble.begin(), preamble.end(), '\n')); - for (int j = 0; j != nlines; ++j) { - texrow.newline(); - } - // We try to load babel late, in case it interferes // with other packages. if (use_babel) { @@ -2096,6 +2090,12 @@ void Buffer::makeLaTeXFile(ostream & os, preamble += "\\makeatother\n"; + int const nlines = + int(lyx::count(preamble.begin(), preamble.end(), '\n')); + for (int j = 0; j != nlines; ++j) { + texrow.newline(); + } + os << preamble; if (only_preamble) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 9df1ee800d..72e7945356 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2003-02-14 Jean-Marc Lasgouttes + + * insetquotes.C (dispString): remove use of acute accent for "'" + right quote. + 2003-01-20 Michael Schmitt * insetert.C: diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index d3dec8129e..2ce8efbee5 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -155,15 +155,6 @@ string const InsetQuotes::dispString(Language const * loclang) const if (times_ == DoubleQ) disp += disp; - if (lyxrc.font_norm_type == LyXRC::ISO_8859_1 - || lyxrc.font_norm_type == LyXRC::ISO_8859_3 - || lyxrc.font_norm_type == LyXRC::ISO_8859_4 - || lyxrc.font_norm_type == LyXRC::ISO_8859_9) { - if (disp == "'") - disp = "´"; - else if (disp == "''") - disp = "´´"; - } if (lyxrc.font_norm_type == LyXRC::ISO_8859_1 || lyxrc.font_norm_type == LyXRC::ISO_8859_9 || lyxrc.font_norm_type == LyXRC::ISO_8859_15) { diff --git a/src/text.C b/src/text.C index d9f7ed110e..2371b70871 100644 --- a/src/text.C +++ b/src/text.C @@ -3273,20 +3273,17 @@ int LyXText::drawLengthMarker(DrawRowParams & p, string const & prefix, str = prefix + " (" + vsp.asLyXCommand() + ")"; - switch (vsp.kind()) { - case VSpace::LENGTH: { + if (vsp.kind() == VSpace::VFILL ) { + ty1 = ty2 = start; + by1 = by2 = end; + } else { // adding or removing space - bool const added = !(vsp.length().len().value() < 0.0); + bool const added = vsp.kind() != VSpace::LENGTH || + vsp.length().len().value() > 0.0; ty1 = added ? (start + arrow_size) : start; ty2 = added ? start : (start + arrow_size); by1 = added ? (end - arrow_size) : end; by2 = added ? end : (end - arrow_size); - break; - } - default: - ty1 = ty2 = start; - by1 = by2 = end; - break; } int const leftx = p.xo + leftMargin(p.bv, p.row); @@ -3299,16 +3296,13 @@ int LyXText::drawLengthMarker(DrawRowParams & p, string const & prefix, int d = 0; LyXFont font; - font.setColor(LColor::added_space).decSize(); + font.setColor(LColor::added_space).decSize().decSize(); font_metrics::rectText(str, font, w, a, d); p.pain->rectText(leftx + 2 * arrow_size + 5, start + ((end - start) / 2) + d, str, font); - if (vsp.kind() != VSpace::LENGTH && vsp.kind() != VSpace::VFILL ) - return size; - // top arrow p.pain->line(leftx, ty1, midx, ty2, LColor::added_space); p.pain->line(midx, ty2, rightx, ty1, LColor::added_space); diff --git a/status.13x b/status.13x index 1901be353d..e6cb14df24 100644 --- a/status.13x +++ b/status.13x @@ -41,6 +41,10 @@ What's new - fix bug where "lyx -e" would refuse to work [Qt only] +- fix display of right quote inset + +- fix off-by-one error in placement of error insets + - fix bug where opening the tabular dialog would mark the document as changed [bug #849, Qt only] @@ -55,6 +59,8 @@ What's new - in the dialogs, replace LaTeX font size names by LyX names for consistency reasons and to resolve a translation conflict +- fix detection of fax programs + - enable the debug level to be set in lyx2lyx - fix strerror() build problem with some gcc/glibc versions [bug #874]