mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
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/trunk@6160 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
d993c534e9
commit
13780bfb63
@ -1,3 +1,10 @@
|
||||
2003-02-14 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* chkconfig.ltx: information is in LaTeXConfig.lyx, not
|
||||
LyXConfig.lyx
|
||||
|
||||
* configure.m4: fix detection of fax programs
|
||||
|
||||
2003-02-14 Juergen Spitzmueller <j.spitzmueller@gmx.de>
|
||||
|
||||
* scripts/TeXFiles.sh: Add search for *.bib-files (>bibFiles.lst)
|
||||
|
@ -256,6 +256,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
|
||||
|
@ -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)
|
||||
|
@ -1,3 +1,13 @@
|
||||
2003-02-14 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* buffer.C (makeLaTeXFile): fix counting of number of line feeds
|
||||
in preamble
|
||||
|
||||
2003-02-14 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* text.C (drawLengthMarker): also draw an arrow marker for
|
||||
symbolic lengths (medskip...)
|
||||
|
||||
2003-02-14 John Levon <levon@movementarian.org>
|
||||
|
||||
* tabular.h:
|
||||
|
12
src/buffer.C
12
src/buffer.C
@ -2122,12 +2122,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) {
|
||||
@ -2152,6 +2146,12 @@ void Buffer::makeLaTeXFile(ostream & os,
|
||||
preamble += "\\dvipost{cbend color pop} \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)
|
||||
|
@ -1,3 +1,8 @@
|
||||
2003-02-14 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* insetquotes.C (dispString): remove use of acute accent for "'"
|
||||
right quote.
|
||||
|
||||
2003-02-14 John Levon <levon@movementarian.org>
|
||||
|
||||
* insettabular.C: changed method names in tabular.C
|
||||
|
@ -152,15 +152,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) {
|
||||
|
20
src/text.C
20
src/text.C
@ -3234,20 +3234,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);
|
||||
@ -3260,16 +3257,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);
|
||||
|
Loading…
Reference in New Issue
Block a user