Skip to content

Add a PGML tag block. #1042

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

Merged
pstaabp merged 5 commits into from
Apr 10, 2024
Merged

Add a PGML tag block. #1042

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e51ccad
Add a PGML tag block.
drgrice1 Mar 23, 2024
039b7e2
Switch to using `[< ... >]` instead of `[^ ... ^]` for tags.
drgrice1 Mar 24, 2024
f81cbf1
Remove the `a` tag from the whitelist for the new tag block.
drgrice1 Mar 29, 2024
ac6f9b2
Remove the `allowPar` option for the tag block.
drgrice1 Mar 29, 2024
ee33ad2
Perform a bit of html validation for PGML tag blocks that are spans.
drgrice1 Mar 30, 2024
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
61 changes: 53 additions & 8 deletions macros/core/PGML.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ sub Rule {
my $self = shift;
my $token = shift;
if ($self->{atLineStart}) {
### check for line end or braces
# check for line end or braces
$self->Item("rule", $token, { options => [ "width", "height", "size" ] });
$self->{ignoreNL} = 1;
} else {
Expand Down Expand Up @@ -690,13 +690,11 @@ sub NOOP {
options => [ "source", "width", "height", "image_options" ]
},
"[<" => {
type => 'link',
parseComments => 1,
parseSubstitutions => 1,
terminator => qr/>\]/,
terminateMethod => 'terminateGetString',
cancelNL => 1,
options => [ "text", "title" ]
type => 'tag',
parseAll => 1,
isContainer => 1,
terminator => qr/>\]/,
options => [qw(html tex ptx)]
},
"[%" => { type => 'comment', parseComments => 1, terminator => qr/%\]/, allowPar => 1 },
"[\@" => {
Expand Down Expand Up @@ -1282,6 +1280,7 @@ sub string {
/forced/ && do { $string = $self->Forced($item); last };
/comment/ && do { $string = $self->Comment($item); last };
/table/ && do { $string = $self->Table($item); last };
/tag/ && do { $string = $self->Tag($item); last };
PGML::Warning "Warning: unknown block type '$item->{type}' in " . ref($self) . "::format\n";
}
push(@strings, $string) unless (!defined $string || $string eq '');
Expand Down Expand Up @@ -1338,6 +1337,11 @@ sub Table {
return ($item->{hasStar} ? main::LayoutTable($table, @options) : main::DataTable($table, @options));
}

sub Tag {
my ($self, $item) = @_;
return $self->string($item);
}

sub Math {
my $self = shift;
my $item = shift;
Expand Down Expand Up @@ -1645,6 +1649,27 @@ sub Math {
return main::general_math_ev3($self->SUPER::Math(@_));
}

sub Tag {
my ($self, $item) = @_;
my %whitelist = (div => 1, span => 1);
my @attributes = ref($item->{html}) eq 'ARRAY' ? @{ $item->{html} } : $item->{html};
my $tag = @attributes % 2 ? (shift @attributes // 'div') : 'div';
unless ($whitelist{$tag}) {
PGML::Warning qq{The tag "$tag" is not allowed};
return $self->string($item);
}
if ($tag eq 'span') {
for my $subblock (@{ $item->{stack} }) {
if ($subblock->{type} =~ /^(indent|align|par|list|bullet|answer|heading|rule|code|pre|verbatim|table|tag)$/)
{
PGML::Warning qq{A "span" tag may not contain a $subblock->{type}};
return $self->string($item);
}
}
}
return main::tag($tag, @attributes, $self->string($item));
}

######################################################################
######################################################################

Expand Down Expand Up @@ -1789,6 +1814,17 @@ sub Math {
return main::general_math_ev3($self->SUPER::Math(@_));
}

sub Tag {
my ($self, $item) = @_;
my ($tex_begin, $tex_end);
if (ref($item->{tex}) eq 'ARRAY') {
($tex_begin, $tex_end) = @{ $item->{tex} };
} elsif ($item->{tex}) {
($tex_begin, $tex_end) = ("\\begin{$item->{tex}}", "\\end{$item->{tex}}");
}
return '{' . ($tex_begin // '') . $self->string($item) . ($tex_end // '') . '}';
}

######################################################################
######################################################################

Expand Down Expand Up @@ -1936,6 +1972,15 @@ sub Math {
return main::general_math_ev3($self->SUPER::Math(@_));
}

sub Tag {
my ($self, $item) = @_;
my @args = ref($item->{ptx}) eq 'ARRAY' ? @{ $item->{ptx} } : $item->{ptx};
if (my $tag = shift @args) {
return NiceTables::tag($self->string($item), $tag, @args);
}
return $self->string($item);
}

######################################################################
######################################################################

Expand Down