Skip to content

protect p{} cell templates with an inner group #2694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dginev wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

protect p{} cell templates with an inner group #2694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/LaTeXML/Engine/TeX_Tables.pool.ltxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ DefColumnType('p{Dimension}', sub {
$LaTeXML::BUILD_TEMPLATE->addColumn(
before => Tokens(T_CS('\vtop'), T_BEGIN, T_CS('\hbox'),
T_LETTER('t'), T_LETTER('o'), $_[1]->revert, T_CS('\relax'),
T_BEGIN),
after => Tokens(T_END, T_END),
T_BEGIN, T_BEGIN),
after => Tokens(T_END, T_END, T_END),
vattach => 'top',
align => 'justify',
); return; });
Expand Down Expand Up @@ -170,7 +170,7 @@ DefConstructor('\halign BoxSpecification',
beforeConstruct => sub {
my ($document) = @_;
$document->maybeCloseElement('ltx:p'); },
afterDigest => sub { # After spec, but before body!
afterDigest => sub { # After spec, but before body!
my ($stomach, $whatsit) = @_;
$whatsit->setProperty(mode => 'internal_vertical');
$stomach->beginMode('restricted_horizontal');
Expand Down Expand Up @@ -360,7 +360,7 @@ sub digestAlignmentColumn {
my ($stomach, $alignment, $lastwascr) = @_;
my $gullet = $stomach->getGullet;
my $ismath = $STATE->lookupValue('IN_MATH');
my $mode = $STATE->lookupValue('MODE');
my $mode = $STATE->lookupValue('MODE');
local @LaTeXML::LIST = ();
# Scan for leading \omit, skipping over (& saving) \hline.
Debug("Halign $alignment: COLUMN starting scan ($mode)") if $LaTeXML::DEBUG{halign};
Expand Down Expand Up @@ -425,7 +425,7 @@ sub digestAlignmentColumn {
push(@LaTeXML::LIST, $stomach->invokeToken($token));
Debug("Halign $alignment: COLUMN " . Stringify($token) . " ==> " . Stringify(List(@LaTeXML::LIST)))
if $LaTeXML::DEBUG{halign};
} } }
} } }
return; }

# This attempts to trim off the column template parts from contents of the full column,
Expand Down
15 changes: 7 additions & 8 deletions lib/LaTeXML/Package/listings.sty.ltxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,12 @@ sub lstPushValueLocally {
our $EMPTY_CATTABLE = LaTeXML::Core::State->new(catcodes => 'none');

# \leavevmode (or any primitive, really) to stop \halign from expanding too far.
DefMacro('\lstinline', '\leavevmode\lx@lstinline');
DefMacro('\lstinline', '\leavevmode\bgroup\lx@lstinline');
DefMacro('\lx@lstinline OptionalKeyVals:LST', sub {
my ($gullet, $keyvals) = @_;
$STATE->getStomach->bgroup; # To localize activation
lstActivate($keyvals); # But do BEFORE reading arg, since some options screw things up.
# get opening delim from gullet, before cattable swap,
# in case token was already peeked for the optional args!
lstActivate($keyvals); # But do BEFORE reading arg, since some options screw things up.
# get opening delim from gullet, before cattable swap,
# in case token was already peeked for the optional args!
my $init = $gullet->readToken;
my $body = listingsReadRawString($gullet, (Equals($init, T_BEGIN) ? T_END : $init));
return (
Expand Down Expand Up @@ -107,7 +106,7 @@ sub lstProcessInline {
DefConstructor('\@listings@inline {}',
"<ltx:text class='ltx_lstlisting' _noautoclose='1'>#1</ltx:text>",
enterHorizontal => 1,
reversion => '\lstinline{#1}');
reversion => '\lstinline{#1}');

# Not a regular environment, since we're going to read the body verbatim!
DefMacroI(T_CS('\begin{lstlisting}'), 'OptionalKeyVals:LST', sub {
Expand Down Expand Up @@ -249,7 +248,7 @@ DefConstructor('\@@listings {}',
. "#tags"
. "#1"
. "</ltx:float>",
mode => 'internal_vertical',
mode => 'internal_vertical',
properties => sub {
my %props = RefStepID('lstlisting');
return %props; },
Expand Down Expand Up @@ -1489,7 +1488,7 @@ DefConstructor('\@listingLiterate {}',
DefConstructor('\@listingKeyword Semiverbatim {}',
"?#class(<ltx:text class='ltx_lst_#class' _noautoclose='1'>#2</ltx:text>)(#2)",
enterHorizontal => 1,
properties => { class => sub {
properties => { class => sub {
my $classname = ToString($_[1]);
my $class = $classname && LookupValue('LST_CLASSES')->{$classname};
my $cssclass = $class && $$class{cssclass};
Expand Down