diff --git a/lib/LaTeXML/Core/Document.pm b/lib/LaTeXML/Core/Document.pm
index 4c311618f..18c39e318 100644
--- a/lib/LaTeXML/Core/Document.pm
+++ b/lib/LaTeXML/Core/Document.pm
@@ -748,7 +748,6 @@ sub openText {
return if $font->getFamily eq 'nullfont';
Debug("openText \"$text\" /" . Stringify($font) . " at " . Stringify($node))
if $LaTeXML::DEBUG{document};
-
# Get the desired font attributes, particularly the desired element
# (usually ltx:text, but let Font override, eg for \emph)
my $declared_font = getNodeFont($self, $node);
@@ -1272,7 +1271,8 @@ our %non_mergeable_attributes = map { $_ => 1; }
qw(about aboutlabelref aboutidref
resource resourcelabelref resourceidref
property rel rev tyupeof datatype content
- data datamimetype dataencoding);
+ data datamimetype dataencoding
+ framed);
# Avoid redundant nesting of font switching elements:
# If we're closing a node that can take font switches and it contains
diff --git a/lib/LaTeXML/Package/LaTeX.pool.ltxml b/lib/LaTeXML/Package/LaTeX.pool.ltxml
index 3a9df6456..4d7ebc6c8 100644
--- a/lib/LaTeXML/Package/LaTeX.pool.ltxml
+++ b/lib/LaTeXML/Package/LaTeX.pool.ltxml
@@ -4695,7 +4695,7 @@ DefMacro('\framebox', '\@ifnextchar(\pic@framebox\@framebox', robust => 1);
DefConstructor('\@framebox[Dimension][]{}',
"?#mathframe(#inner)"
. "(#3)",
alias => '\framebox', sizer => '#3',
beforeDigest => sub {
@@ -4704,8 +4704,10 @@ DefConstructor('\@framebox[Dimension][]{}',
$stomach->beginMode('text');
AssignValue(FRAME_IN_MATH => $wasmath); },
properties => sub {
+ my $sep= LookupRegister('\fboxsep')->toAttribute;
(($_[2] ? (align => $makebox_alignment{ ToString($_[2]) }) : ()),
framecolor => LookupValue('font')->getColor,
+ ($sep ne '3.0pt' ? (cssstyle => 'padding:' . $sep):()),
($_[1] ? (width => $_[1]) : ())); },
afterDigest => sub {
my ($stomach, $whatsit) = @_;
@@ -4724,7 +4726,8 @@ DefConstructor('\@framebox[Dimension][]{}',
my $model = $document->getModel;
# and that child can have the framed attribute
if ((scalar(@c) == 1)
- && $document->canHaveAttribute($model->getNodeQName($c[0]), 'framed')) {
+ && $document->canHaveAttribute($model->getNodeQName($c[0]), 'framed')
+ && !$c[0]->hasAttribute('framed')) {
# unwrap, copying the attributes
$document->unwrapNodes($node);
foreach my $k (qw(width align framed)) {
diff --git a/lib/LaTeXML/Package/ntheorem.sty.ltxml b/lib/LaTeXML/Package/ntheorem.sty.ltxml
index d60a40614..fbeb20869 100644
--- a/lib/LaTeXML/Package/ntheorem.sty.ltxml
+++ b/lib/LaTeXML/Package/ntheorem.sty.ltxml
@@ -176,7 +176,7 @@ Let('\renewtheorem', '\newtheorem');
DefConstructorI('\lx@addframing', undef, sub {
my ($doc, %props) = @_;
my $node = $doc->getElement;
- $doc->addClass($node, 'ltx_framed');
+ $doc->setAttribute($node, framed => 'rectangle');
my $css = $node->getAttribute('cssstyle');
my $pad = 'padding:' . $props{margin} . 'pt;';
$doc->setAttribute($node, cssstyle => ($css ? $css . ';' . $pad : $pad)); },
diff --git a/lib/LaTeXML/Package/titlesec.sty.ltxml b/lib/LaTeXML/Package/titlesec.sty.ltxml
index 3c1120a46..6bdac3117 100644
--- a/lib/LaTeXML/Package/titlesec.sty.ltxml
+++ b/lib/LaTeXML/Package/titlesec.sty.ltxml
@@ -34,7 +34,7 @@ DefMacro('\lx@titleformat@star {}{}', sub {
Tokens($format, T_SPACE, T_PARAM, T_OTHER('1'))); });
our %titlesec_shape_class_map = (
runin => 'ltx_runin',
- frame => 'ltx_framed',
+ frame => 'ltx_framed ltx_framed_rectangle',
rightmargin => 'ltx_align_right',
leftmargin => 'ltx_align_left'
);
diff --git a/lib/LaTeXML/resources/CSS/LaTeXML.css b/lib/LaTeXML/resources/CSS/LaTeXML.css
index fea09e1d4..fde25dc61 100644
--- a/lib/LaTeXML/resources/CSS/LaTeXML.css
+++ b/lib/LaTeXML/resources/CSS/LaTeXML.css
@@ -347,7 +347,6 @@ span.ltx_rowspan { position:absolute; top:0; bottom:0; }
.ltx_td,
.ltx_th { display:table-cell; }
-.ltx_framed { border:1px solid black;}
.ltx_tabular .ltx_td,
.ltx_tabular .ltx_th { padding:0.1em 0.5em; }
/* regular lines */
@@ -366,6 +365,8 @@ span.ltx_rowspan { position:absolute; top:0; bottom:0; }
.ltx_border_B { border-bottom:1px solid gray; }
.ltx_border_L { border-left:1px solid gray; }
/* Framing */
+.ltx_framed { padding:3pt; }
+span.ltx_framed { display:inline-block; text-indent:0; } /* avoid padding/margin collapse */
.ltx_framed_rectangle { border-style:solid; border-width:1px; }
.ltx_framed_top { border-top-style:solid; border-top-width:1px; }
.ltx_framed_left { border-left-style:solid; border-left-width:1px; }
diff --git a/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rnc b/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rnc
index 8a82ca271..050c5331d 100644
--- a/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rnc
+++ b/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rnc
@@ -183,7 +183,13 @@ Backgroundable.attributes =
## In postprocessing, these values are carried to the \attr{class} attribute,
## and can thus be effected by CSS; the background will presumably
## correspond to a bounding rectangle, but is determined by the CSS rendering engine.
- attribute backgroundcolor { text }?
+ attribute backgroundcolor { text }?,
+
+ ## the kind of frame or outline for the box.
+ attribute framed { "rectangle" | "underline" | text }?,
+
+ ## the color of the frame or outlie for the box.
+ attribute framecolor { text }?
## Attributes shared by low-level, generic inline and block elements
## that can be sized or shifted.
@@ -212,13 +218,7 @@ Positionable.attributes =
attribute vattach { "top" | "middle" | "bottom" | "baseline" }?,
## the horizontal floating placement parameter that determines where the object is displayed.
- attribute float { ( "right" | "left" | text) }?,
-
- ## the kind of frame or outline for the box.
- attribute framed { "rectangle" | "underline" | text }?,
-
- ## the color of the frame or outlie for the box.
- attribute framecolor { text }?
+ attribute float { ( "right" | "left" | text) }?
## Attributes shared by (hopefully few) elements that can be transformed.
## Such elements should also have Positionable.attributes.
diff --git a/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rng b/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rng
index e1749b725..916a7d9c5 100644
--- a/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rng
+++ b/lib/LaTeXML/resources/RelaxNG/LaTeXML-common.rng
@@ -241,6 +241,21 @@ and can thus be effected by CSS; the background will presumably
correspond to a bounding rectangle, but is determined by the CSS rendering engine.
+
+
+ the kind of frame or outline for the box.
+
+ rectangle
+ underline
+
+
+
+
+
+
+ the color of the frame or outlie for the box.
+
+
Attributes shared by low-level, generic inline and block elements
@@ -308,21 +323,6 @@ The default is baseline.
-
-
- the kind of frame or outline for the box.
-
- rectangle
- underline
-
-
-
-
-
-
- the color of the frame or outlie for the box.
-
-
Attributes shared by (hopefully few) elements that can be transformed.
diff --git a/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rnc b/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rnc
index 93519a213..7ab5e9377 100644
--- a/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rnc
+++ b/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rnc
@@ -141,7 +141,8 @@ element rule { rule_attributes, rule_model }
rule_attributes =
Common.attributes,
Positionable.attributes,
- Colorable.attributes
+ Colorable.attributes,
+ Backgroundable.attributes
## Content model for \elementref{rule}.
rule_model = empty
diff --git a/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rng b/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rng
index d9a5635de..d689a3057 100644
--- a/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rng
+++ b/lib/LaTeXML/resources/RelaxNG/LaTeXML-inline.rng
@@ -180,6 +180,7 @@ mixed with arbitrary characters.
| red |
- XX 1 0 0 |
- XX 0 1 1 0 |
- XX 0 1 1 |
- XX FF0000 |
- XX 0.3 |
+ XX 1 0 0 |
+ XX 0 1 1 0 |
+ XX 0 1 1 |
+ XX FF0000 |
+ XX 0.3 |
| green |
- XX 0 1 0 |
- XX 1 0 1 0 |
- XX 0.3333 1 1 |
- XX 00FF00 |
- XX 0.59 |
+ XX 0 1 0 |
+ XX 1 0 1 0 |
+ XX 0.3333 1 1 |
+ XX 00FF00 |
+ XX 0.59 |
| blue |
- XX 0 0 1 |
- XX 1 1 0 0 |
- XX 0.6667 1 1 |
- XX 0000FF |
- XX 0.11 |
+ XX 0 0 1 |
+ XX 1 1 0 0 |
+ XX 0.6667 1 1 |
+ XX 0000FF |
+ XX 0.11 |
| cyan |
- XX 0 1 1 |
- XX 1 0 0 0 |
- XX 0.5 1 1 |
- XX 00FFFF |
- XX 0.7 |
+ XX 0 1 1 |
+ XX 1 0 0 0 |
+ XX 0.5 1 1 |
+ XX 00FFFF |
+ XX 0.7 |
| magenta |
- XX 1 0 1 |
- XX 0 1 0 0 |
- XX 0.8333 1 1 |
- XX FF00FF |
- XX 0.41 |
+ XX 1 0 1 |
+ XX 0 1 0 0 |
+ XX 0.8333 1 1 |
+ XX FF00FF |
+ XX 0.41 |
| yellow |
- XX 1 1 0 |
- XX 0 0 1 0 |
- XX 0.1667 1 1 |
- XX FFFF00 |
- XX 0.89 |
+ XX 1 1 0 |
+ XX 0 0 1 0 |
+ XX 0.1667 1 1 |
+ XX FFFF00 |
+ XX 0.89 |
| orange |
- XX 1 0.5 0 |
- XX 0 0.5 1 0 |
- XX 0.0833 1 1 |
- XX FF8000 |
- XX 0.595 |
+ XX 1 0.5 0 |
+ XX 0 0.5 1 0 |
+ XX 0.0833 1 1 |
+ XX FF8000 |
+ XX 0.595 |
| violet |
- XX 0.5 0 0.5 |
- XX 0 0.5 0 0.5 |
- XX 0.8333 1 0.5 |
- XX 800080 |
- XX 0.205 |
+ XX 0.5 0 0.5 |
+ XX 0 0.5 0 0.5 |
+ XX 0.8333 1 0.5 |
+ XX 800080 |
+ XX 0.205 |
| purple |
- XX 0.75 0 0.25 |
- XX 0 0.75 0.5 0.25 |
- XX 0.9444 1 0.75 |
- XX BF0040 |
- XX 0.2525 |
+ XX 0.75 0 0.25 |
+ XX 0 0.75 0.5 0.25 |
+ XX 0.9444 1 0.75 |
+ XX BF0040 |
+ XX 0.2525 |
| brown |
- XX 0.75 0.5 0.25 |
- XX 0 0.25 0.5 0.25 |
- XX 0.0833 0.6667 0.75 |
- XX BF8040 |
- XX 0.5475 |
+ XX 0.75 0.5 0.25 |
+ XX 0 0.25 0.5 0.25 |
+ XX 0.0833 0.6667 0.75 |
+ XX BF8040 |
+ XX 0.5475 |
| pink |
- XX 1 0.75 0.75 |
- XX 0 0.25 0.25 0 |
- XX 0 0.25 1 |
- XX FFBFBF |
- XX 0.825 |
+ XX 1 0.75 0.75 |
+ XX 0 0.25 0.25 0 |
+ XX 0 0.25 1 |
+ XX FFBFBF |
+ XX 0.825 |
| olive |
- XX 0.5 0.5 0 |
- XX 0 0 1 0.5 |
- XX 0.1667 1 0.5 |
- XX 808000 |
- XX 0.39 |
+ XX 0.5 0.5 0 |
+ XX 0 0 1 0.5 |
+ XX 0.1667 1 0.5 |
+ XX 808000 |
+ XX 0.39 |
| black |
- XX 0 0 0 |
- XX 0 0 0 1 |
- XX 0 0 0 |
- XX 000000 |
- XX 0 |
+ XX 0 0 0 |
+ XX 0 0 0 1 |
+ XX 0 0 0 |
+ XX 000000 |
+ XX 0 |
| darkgray |
- XX 0.25 0.25 0.25 |
- XX 0 0 0 0.75 |
- XX 0 0 0.25 |
- XX 404040 |
- XX 0.25 |
+ XX 0.25 0.25 0.25 |
+ XX 0 0 0 0.75 |
+ XX 0 0 0.25 |
+ XX 404040 |
+ XX 0.25 |
| gray |
- XX 0.5 0.5 0.5 |
- XX 0 0 0 0.5 |
- XX 0 0 0.5 |
- XX 808080 |
- XX 0.5 |
+ XX 0.5 0.5 0.5 |
+ XX 0 0 0 0.5 |
+ XX 0 0 0.5 |
+ XX 808080 |
+ XX 0.5 |
| lightgray |
- XX 0.75 0.75 0.75 |
- XX 0 0 0 0.25 |
- XX 0 0 0.75 |
- XX BFBFBF |
- XX 0.75 |
+ XX 0.75 0.75 0.75 |
+ XX 0 0 0 0.25 |
+ XX 0 0 0.75 |
+ XX BFBFBF |
+ XX 0.75 |
| white |
- XX 1 1 1 |
- XX 0 0 0 0 |
- XX 0 0 1 |
- XX FFFFFF |
- XX 1 |
+ XX 1 1 1 |
+ XX 0 0 0 0 |
+ XX 0 0 1 |
+ XX FFFFFF |
+ XX 1 |
| -red |
- XX 0 1 1 |
- XX 1 0 0 0 |
- XX 0.5 1 1 |
- XX 00FFFF |
- XX 0.7 |
+ XX 0 1 1 |
+ XX 1 0 0 0 |
+ XX 0.5 1 1 |
+ XX 00FFFF |
+ XX 0.7 |
| -green |
- XX 1 0 1 |
- XX 0 1 0 0 |
- XX 0.8333 1 1 |
- XX FF00FF |
- XX 0.41 |
+ XX 1 0 1 |
+ XX 0 1 0 0 |
+ XX 0.8333 1 1 |
+ XX FF00FF |
+ XX 0.41 |
| -blue |
- XX 1 1 0 |
- XX 0 0 1 0 |
- XX 0.1667 1 1 |
- XX FFFF00 |
- XX 0.89 |
+ XX 1 1 0 |
+ XX 0 0 1 0 |
+ XX 0.1667 1 1 |
+ XX FFFF00 |
+ XX 0.89 |
| -cyan |
- XX 1 0 0 |
- XX 0 1 1 0 |
- XX 0 1 1 |
- XX FF0000 |
- XX 0.3 |
+ XX 1 0 0 |
+ XX 0 1 1 0 |
+ XX 0 1 1 |
+ XX FF0000 |
+ XX 0.3 |
| -magenta |
- XX 0 1 0 |
- XX 1 0 1 0 |
- XX 0.3333 1 1 |
- XX 00FF00 |
- XX 0.59 |
+ XX 0 1 0 |
+ XX 1 0 1 0 |
+ XX 0.3333 1 1 |
+ XX 00FF00 |
+ XX 0.59 |
| -yellow |
- XX 0 0 1 |
- XX 1 1 0 0 |
- XX 0.6667 1 1 |
- XX 0000FF |
- XX 0.11 |
+ XX 0 0 1 |
+ XX 1 1 0 0 |
+ XX 0.6667 1 1 |
+ XX 0000FF |
+ XX 0.11 |
| -orange |
- XX 0 0.5 1 |
- XX 1 0.5 0 0 |
- XX 0.5833 1 1 |
- XX 0080FF |
- XX 0.405 |
+ XX 0 0.5 1 |
+ XX 1 0.5 0 0 |
+ XX 0.5833 1 1 |
+ XX 0080FF |
+ XX 0.405 |
| -violet |
- XX 0.5 1 0.5 |
- XX 0.5 0 0.5 0 |
- XX 0.3333 0.5 1 |
- XX 80FF80 |
- XX 0.795 |
+ XX 0.5 1 0.5 |
+ XX 0.5 0 0.5 0 |
+ XX 0.3333 0.5 1 |
+ XX 80FF80 |
+ XX 0.795 |
| -purple |
- XX 0.25 1 0.75 |
- XX 0.75 0 0.25 0 |
- XX 0.4444 0.75 1 |
- XX 40FFBF |
- XX 0.7475 |
+ XX 0.25 1 0.75 |
+ XX 0.75 0 0.25 0 |
+ XX 0.4444 0.75 1 |
+ XX 40FFBF |
+ XX 0.7475 |
| -brown |
- XX 0.25 0.5 0.75 |
- XX 0.5 0.25 0 0.25 |
- XX 0.5833 0.6667 0.75 |
- XX 4080BF |
- XX 0.4525 |
+ XX 0.25 0.5 0.75 |
+ XX 0.5 0.25 0 0.25 |
+ XX 0.5833 0.6667 0.75 |
+ XX 4080BF |
+ XX 0.4525 |
| -pink |
- XX 0 0.25 0.25 |
- XX 0.25 0 0 0.75 |
- XX 0.5 1 0.25 |
- XX 004040 |
- XX 0.175 |
+ XX 0 0.25 0.25 |
+ XX 0.25 0 0 0.75 |
+ XX 0.5 1 0.25 |
+ XX 004040 |
+ XX 0.175 |
| -olive |
- XX 0.5 0.5 1 |
- XX 0.5 0.5 0 0 |
- XX 0.6667 0.5 1 |
- XX 8080FF |
- XX 0.555 |
+ XX 0.5 0.5 1 |
+ XX 0.5 0.5 0 0 |
+ XX 0.6667 0.5 1 |
+ XX 8080FF |
+ XX 0.555 |
| -black |
- XX 1 1 1 |
- XX 0 0 0 0 |
- XX 0 0 1 |
- XX FFFFFF |
- XX 1 |
+ XX 1 1 1 |
+ XX 0 0 0 0 |
+ XX 0 0 1 |
+ XX FFFFFF |
+ XX 1 |
| -darkgray |
- XX 0.75 0.75 0.75 |
- XX 0 0 0 0.25 |
- XX 0 0 0.75 |
- XX BFBFBF |
- XX 0.75 |
+ XX 0.75 0.75 0.75 |
+ XX 0 0 0 0.25 |
+ XX 0 0 0.75 |
+ XX BFBFBF |
+ XX 0.75 |
| -gray |
- XX 0.5 0.5 0.5 |
- XX 0 0 0 0.5 |
- XX 0 0 0.5 |
- XX 808080 |
- XX 0.5 |
+ XX 0.5 0.5 0.5 |
+ XX 0 0 0 0.5 |
+ XX 0 0 0.5 |
+ XX 808080 |
+ XX 0.5 |
| -lightgray |
- XX 0.25 0.25 0.25 |
- XX 0 0 0 0.75 |
- XX 0 0 0.25 |
- XX 404040 |
- XX 0.25 |
+ XX 0.25 0.25 0.25 |
+ XX 0 0 0 0.75 |
+ XX 0 0 0.25 |
+ XX 404040 |
+ XX 0.25 |
| -white |
- XX 0 0 0 |
- XX 0 0 0 1 |
- XX 0 0 0 |
- XX 000000 |
- XX 0 |
+ XX 0 0 0 |
+ XX 0 0 0 1 |
+ XX 0 0 0 |
+ XX 000000 |
+ XX 0 |
| JungleGreen |
- XX 0.01 1 0.48 |
- XX 0.99 0 0.52 0 |
- XX 0.4125 0.99 1 |
- XX 03FF7A |
- XX 0.6458 |
+ XX 0.01 1 0.48 |
+ XX 0.99 0 0.52 0 |
+ XX 0.4125 0.99 1 |
+ XX 03FF7A |
+ XX 0.6458 |
| DarkOrchid |
- XX 0.6 0.2 0.8 |
- XX 0.4 0.8 0.2 0 |
- XX 0.7778 0.75 0.8 |
- XX 9933CC |
- XX 0.386 |
+ XX 0.6 0.2 0.8 |
+ XX 0.4 0.8 0.2 0 |
+ XX 0.7778 0.75 0.8 |
+ XX 9933CC |
+ XX 0.386 |
| -JungleGreen |
- XX 0.99 0 0.52 |
- XX 0 0.99 0.47 0.01 |
- XX 0.9125 1 0.99 |
- XX FC0085 |
- XX 0.3542 |
+ XX 0.99 0 0.52 |
+ XX 0 0.99 0.47 0.01 |
+ XX 0.9125 1 0.99 |
+ XX FC0085 |
+ XX 0.3542 |
| -DarkOrchid |
- XX 0.4 0.8 0.2 |
- XX 0.4 0 0.6 0.2 |
- XX 0.2778 0.75 0.8 |
- XX 66CC33 |
- XX 0.614 |
+ XX 0.4 0.8 0.2 |
+ XX 0.4 0 0.6 0.2 |
+ XX 0.2778 0.75 0.8 |
+ XX 66CC33 |
+ XX 0.614 |
diff --git a/t/theorem/ntheorem.xml b/t/theorem/ntheorem.xml
index 486a3ec0d..60dea6c77 100644
--- a/t/theorem/ntheorem.xml
+++ b/t/theorem/ntheorem.xml
@@ -1474,7 +1474,7 @@ The first Kappa-Theorem has been given in [ยง1.2
<tag close=" ">1.2</tag>Framed and Shaded Theorems
-
+
Theorem 9
9
]