anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-14 04:21:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hmmm. It appears I've been careless and already committed a work in progress

Browse Source 
of reLyX support for minipages. This commit brings it up to speed save for
two caveats. See the ChangeLog.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6088 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-02-11 10:27:52 +00:00
parent a55306363e
commit b6f3c17004
2 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ChangeLog
View File

@ -1,3 +1,17 @@
2003-02-11 Angus Leeming <leeming@lyx.org>
* reLyX/BasicLyX.pm: add support for minipages. The inner-pos optional
argument is currently parsed but ignored because I'm not sure how
LyX wants it.
Known bug: if the paragraph ends '\end{minipage}%', then the '%'
causes the next paragraph to be concatenated with this one. This is
a generic reLyX bug that I'll try and track down.
2003-02-10 Angus Leeming <leeming@lyx.org>
* reLyX/syntax.default: fix natbib commands that LyX will only allow
a single optional arg for.
2003-02-08 John Levon <levon@movementarian.org> 2003-02-08 John Levon <levon@movementarian.org>
* chkconfig.ltx: look for dvipost package * chkconfig.ltx: look for dvipost package

56
lib/reLyX/BasicLyX.pm
View File

@ -1028,38 +1028,60 @@ sub basic_lyx {
# The minipage environment is defined as: # The minipage environment is defined as:
# \begin{minipage}[pos][height][inner-pos]{width} <text> # \begin{minipage}[pos][height][inner-pos]{width} <text>
# \end{minipage} # \end{minipage}
my $pos = foo bar....
# Read any optional argument. # Read the position optional argument, if it exists
$tok = $fileobject->eatOptionalArgument; $tok = $fileobject->eatOptionalArgument;
my $arg = $tok->print if defined($tok->print); my $pos = $tok->print if defined($tok->print);
my %map = ('t' => '0', 'c' => '1', 'b' => '2'); my %map = ('t' => '0', 'c' => '1', 'b' => '2');
if ($debug_on && $arg ne '' && !defined($map{$arg})) { if ($debug_on && $pos ne '' && !defined($map{$pos})) {
print "\nIgnoring unknown positioning arg '$arg'\n"; print "\nIgnoring unknown positioning arg '$pos'\n";
} }
# The minipage is centred by default. # The minipage is centred by default.
$arg = '1' if (!defined($map{$arg}) || $pos = '1' if (!defined($map{$pos}) ||
($arg = $map{$arg}) eq ''); ($pos = $map{$pos}) eq '');
# Read the height optional argument, if it exists
my $height = '0pt';
$tok = $fileobject->eatOptionalArgument;
if (defined($tok->print)) {
$height = $tok->print;
# if something like '4.5\columnwidth', translate into
# LyXese.
if ($height =~ /([0-9.]*)\s*(\\[a-z]*)/) {
if (defined($lengthAsLyXString{$2})) {
$height = ($1 * 100) . $lengthAsLyXString{$2};
}
}
}
# Read the inner-pos optional argument, if it exists
my $innerpos = $pos;
$tok = $fileobject->eatOptionalArgument;
if (defined($tok->print)) {
my $arg = $tok->print;
print("\nMinipage inner-pos argument, $arg, is ",
"currently ignored\n");
}
# Read the width as (a reference to) an array of tokens. # Read the width as (a reference to) an array of tokens.
$tok = $fileobject->eatBalanced; $tok = $fileobject->eatBalanced;
# $arg is Something like either '4.5cm' or '\columnwidth'. # $width is Something like either '4.5cm' or '\columnwidth'.
$arg = pop(@{$tok})->print; my $width = pop(@{$tok})->print;
# If $arg is something like '\columnwidth', then manipulate # If $width is something like '\columnwidth', then manipulate
# it into LyX format and also extract the length itself. # it into LyX format and also extract the length itself.
if (defined($lengthAsLyXString{$arg})) { if (defined($lengthAsLyXString{$width})) {
$arg = $lengthAsLyXString{$arg}; $width = $lengthAsLyXString{$width};
my $val = pop(@{$tok}); my $val = pop(@{$tok});
$val = (defined($val)) ? $val->print : '0'; $val = (defined($val)) ? $val->print : '0';
$arg = ($val * 100) . $arg; $width = ($val * 100) . $width;
} }
print OUTFILE "position $arg\n"; print OUTFILE "position $pos\n";
print OUTFILE "inner_position 0\n"; print OUTFILE "inner_position $innerpos\n";
print OUTFILE "height \"0pt\"\n"; print OUTFILE "height $height\n";
print OUTFILE "width \"$arg\"\n"; print OUTFILE "width $width\n";
print OUTFILE "collapsed false\n"; print OUTFILE "collapsed false\n";
# \begin document # \begin document