version 1.346, 2006/12/18 11:07:43
|
version 1.350, 2007/01/08 19:09:23
|
Line 2251 sub end_table {
|
Line 2251 sub end_table {
|
} |
} |
$have_rowspan++; |
$have_rowspan++; |
$output .= '\multirow{'.$rowspan.'}[0]{*}{'; |
$output .= '\multirow{'.$rowspan.'}[0]{*}{'; |
|
|
|
$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~ |
|
s{^\s*\\par\s*}{}; |
|
$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~ |
|
s{\s*\\vskip\s*0pt\s*$}{}; |
|
|
# |
# |
# If we did not throw in a multicolumn to align, then add |
# If we did not throw in a multicolumn to align, then add |
# an extra { |
# an extra { |
Line 2890 sub start_img {
|
Line 2896 sub start_img {
|
} elsif ($latex_rendering eq "parbox") { |
} elsif ($latex_rendering eq "parbox") { |
$currentstring = '\begin{minipage}[l]{'.$width_param.'mm}' |
$currentstring = '\begin{minipage}[l]{'.$width_param.'mm}' |
.$currentstring.'\end{minipage}'; |
.$currentstring.'\end{minipage}'; |
} else { # wrapfig render |
} elsif ($latex_rendering eq "wrapfigure" |
$currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}' |
|| $latex_rendering ne 'none') { # wrapfig render |
|
$currentstring = |
|
'\begin{wrapfigure}{l}{'.$width_param.'mm}' |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
} |
} |
} elsif ($align eq "right") { |
} elsif ($align eq "right") { |
Line 2900 sub start_img {
|
Line 2908 sub start_img {
|
} elsif ($latex_rendering eq "parbox") { |
} elsif ($latex_rendering eq "parbox") { |
$currentstring = '\begin{minipage}[r]{'.$width_param.'mm}' |
$currentstring = '\begin{minipage}[r]{'.$width_param.'mm}' |
.$currentstring.'\end{minipage}'; |
.$currentstring.'\end{minipage}'; |
} else { # wrapfig rendering |
} elsif ($latex_rendering eq "wrapfigure" |
$currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}' |
|| $latex_rendering ne 'none') { # wrapfig render |
|
$currentstring = |
|
'\begin{wrapfigure}{r}{'.$width_param.'mm}' |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
|
|
} |
} |
} else { # Bottom is also default. |
} else { # Bottom is also default. |
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
Line 2935 sub start_img {
|
Line 2944 sub start_img {
|
$currentstring .=&Apache::edit::select_arg('Alignment:','align', |
$currentstring .=&Apache::edit::select_arg('Alignment:','align', |
['','bottom','middle','top','left','right'],$token,5); |
['','bottom','middle','top','left','right'],$token,5); |
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap', |
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap', |
['', 'parbox', 'parpic'], $token, 2); |
['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2); |
$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl', |
$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl', |
['no','yes'], $token, 2); |
['no','yes'], $token, 2); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |