diff --git a/.gitignore b/.gitignore index cacd231..b3e6e62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /LaTeXML-0.8.2.tar.gz /LaTeXML-0.8.3.tar.gz /LaTeXML-0.8.4.tar.gz +/LaTeXML-0.8.5.tar.gz diff --git a/LaTeXML-0.8.4-github-pr-1270.patch b/LaTeXML-0.8.4-github-pr-1270.patch deleted file mode 100644 index de76ea6..0000000 --- a/LaTeXML-0.8.4-github-pr-1270.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -u --recursive a/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml b/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml ---- a/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml 2020-05-25 20:09:45.953218298 -0400 -+++ b/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml 2020-05-25 20:10:48.366693716 -0400 -@@ -474,8 +474,28 @@ - DefMacro('\lxSVG@endgroups', sub { - map { T_CS('\lxSVG@endgroup') } 1 .. LookupValue('pgf_scopecount'); }); - --DefConstructor('\lxSVG@begingroup@ RequiredKeyVals', -- '', -+DefConstructor('\lxSVG@begingroup@ RequiredKeyVals', sub { -+ my ($doc, $kv) = @_; -+ my $g_attrs = $kv->getKeyVals; -+ my @keys = keys %$g_attrs; -+ my $this = $doc->getElement; -+ my $orig_this_name = $doc->getNodeQName($this); -+ # Special case check: if we are in a latexml context, the parent svg:g is acceptable -+ if ($orig_this_name =~ /^ltx:/ && (my $g_ancestor = $doc->findnode("ancestor::svg:g", $this))) { -+ # Sometimes even when we have a parent g, there is an attribute conflict -+ # and we need to open a new one. AND make it the current insertion point OR?! -+ my @needs_wrap = grep { $g_ancestor->hasAttribute($_) } @keys; -+ if (@needs_wrap) { # incompatible, wrap with new g -+ $this = $doc->wrapNodes('svg:g', $g_ancestor->lastChild); } -+ else { # compatible, reuse -+ $this = $g_ancestor; } } -+ else { # all other cases, just open a g. -+ # TODO: Redundant g's get made, we can merge them on afterClose? -+ $this = $doc->openElement('svg:g'); } -+ # We have the _correct_ svg:g here, let's assign the attributes -+ foreach my $key (@keys) { -+ my $value = $kv->getValue($key); -+ $doc->setAttribute($this, $key, $value); } }, - reversion => '', sizer => 0); - - DefConstructor('\lxSVG@endgroup@', -diff -u --recursive a/lib/LaTeXML/Package.pm b/lib/LaTeXML/Package.pm ---- a/lib/LaTeXML/Package.pm 2020-05-25 20:09:45.938218425 -0400 -+++ b/lib/LaTeXML/Package.pm 2020-05-25 20:10:48.365693724 -0400 -@@ -4034,7 +4034,7 @@ - - C or C can be used in - place of C; these will be run as a group --bfore, or after (respectively) the unmodified blocks. -+before, or after (respectively) the unmodified blocks. - - =item CI($document,$box)> - diff --git a/LaTeXML.spec b/LaTeXML.spec index 9d5b4a0..973590f 100644 --- a/LaTeXML.spec +++ b/LaTeXML.spec @@ -1,12 +1,11 @@ Name: LaTeXML -Version: 0.8.4 -Release: 5%{?dist} +Version: 0.8.5 +Release: 1%{?dist} Summary: Converts TeX and LaTeX to XML/HTML/ePub/MathML License: Public Domain URL: http://dlmf.nist.gov/LaTeXML/ Source0: http://search.cpan.org/CPAN/authors/id/B/BR/BRMILLER/%{name}-%{version}.tar.gz -Patch0: LaTeXML-0.8.4-github-pr-1270.patch BuildArch: noarch @@ -111,6 +110,10 @@ mktexlsr >/dev/null 2>&1 || : mktexlsr >/dev/null 2>&1 || : %changelog +* Tue Nov 17 2020 W. Michael Petullo - 0.8.5-1 +- New upstream version +- Remove patch that was merged into 0.8.5 + * Mon Jul 27 2020 Fedora Release Engineering - 0.8.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 286d8dd..c8e4aef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LaTeXML-0.8.4.tar.gz) = 1799a89c98d3457d813735679ade005645bfa8a1b264aab08f9baf8fc4fc91cb00978e6168d26a614beefdaac4b3dcbe63ba3504ae69a2c889e28d177bc6b01c +SHA512 (LaTeXML-0.8.5.tar.gz) = 20940710b49308a6bc3b7cc4653651a9e746126e8905d44aaf67d5b18ca5b80031a921d9da1c878f9eae059c015278eb3e4c98a130529e861a5ff0d4673d5532