Skip to content

Commit

Permalink
Slightly better choice of space chars, updating tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@brucemiller
brucemiller committed Sep 29, 2024
1 parent 3bfb14f commit ba0d027
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 31 deletions.
10 changes: 8 additions & 2 deletions lib/LaTeXML/Engine/TeX_Glue.pool.ltxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,14 @@ use LaTeXML::Package;
# \unskip c removes a glue item from the current list.

our @spaces = ( # Spaces to fake spacing, with width in ems
[0.167, "\x{2006}"], [0.222, "\x{2005}"], [0.278, "\x{2004}"],
[0.333, UTF(0xA0)], [0.5, "\x{2002}"], [1.0, "\x{2003}"]);
[0.100, "\x{200A}"], # Hair space (thinner than thin space)
[0.167, "\x{2006}"], # six-per-em
[0.200, "\x{2009}"], # five-per-em, thin space
[0.250, "\x{2005}"], # four-per-em, mid space
[0.333, "\x{2004}"], # three-per-em, thick space
[0.500, "\x{2002}"], # en-quad, "nut"
[1.000, "\x{2003}"], # em-quad, "mutton"
);

# String of spacing chars with width roughly equivalent to $dimen
sub DimensionToSpaces {
Expand Down
4 changes: 2 additions & 2 deletions t/alignment/tabular.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<tabular vattach="middle">
<tbody>
<tr>
<td align="justify" class="ltx_nopad_l ltx_nopad_r" vattach="top">1 <inline-block vattach="top">
<td align="justify" class="ltx_nopad_l ltx_nopad_r" vattach="top">1  <inline-block vattach="top">
<p width="30.0pt">a</p>
</inline-block>2</td>
<td align="justify" class="ltx_nopad_l ltx_nopad_r" vattach="top"><inline-block vattach="top">
Expand All @@ -88,7 +88,7 @@
</inline-block>4</td>
</tr>
<tr>
<td align="justify" class="ltx_nopad_l ltx_nopad_r" vattach="top">1 <inline-block vattach="top">
<td align="justify" class="ltx_nopad_l ltx_nopad_r" vattach="top">1  <inline-block vattach="top">
<p width="30.0pt">a a a a a a a a a a</p>
</inline-block>2</td>
<td align="justify" class="ltx_nopad_l ltx_nopad_r" vattach="top"><inline-block vattach="top">
Expand Down
48 changes: 24 additions & 24 deletions t/complex/figure_mixed_content.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,22 +557,22 @@
<listingline xml:id="alg2.l16"><tags>
<tag><text fontsize="80%">16:</text></tag>
<tag role="refnum">16</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l17"><tags>
<tag><text fontsize="80%">17:</text></tag>
<tag role="refnum">17</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l18"><tags>
<tag><text fontsize="80%">18:</text></tag>
<tag role="refnum">18</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l19"><tags>
<tag><text fontsize="80%">19:</text></tag>
<tag role="refnum">19</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l20"><tags>
<tag><text fontsize="80%">20:</text></tag>
Expand All @@ -582,42 +582,42 @@
<listingline xml:id="alg2.l21"><tags>
<tag><text fontsize="80%">21:</text></tag>
<tag role="refnum">21</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l22"><tags>
<tag><text fontsize="80%">22:</text></tag>
<tag role="refnum">22</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l23"><tags>
<tag><text fontsize="80%">23:</text></tag>
<tag role="refnum">23</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l24"><tags>
<tag><text fontsize="80%">24:</text></tag>
<tag role="refnum">24</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l25"><tags>
<tag><text fontsize="80%">25:</text></tag>
<tag role="refnum">25</tag>
</tags>         line
</tags>           line
</listingline>
<listingline xml:id="alg2.l26"><tags>
<tag><text fontsize="80%">26:</text></tag>
<tag role="refnum">26</tag>
</tags>         line
</tags>           line
</listingline>
<listingline xml:id="alg2.l27"><tags>
<tag><text fontsize="80%">27:</text></tag>
<tag role="refnum">27</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l28"><tags>
<tag><text fontsize="80%">28:</text></tag>
<tag role="refnum">28</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg2.l29"><tags>
<tag><text fontsize="80%">29:</text></tag>
Expand Down Expand Up @@ -745,7 +745,7 @@
<listingline xml:id="alg3.l10"><tags>
<tag><text fontsize="80%">10:</text></tag>
<tag role="refnum">10</tag>
</tags>      line
</tags>       line
</listingline>
<listingline xml:id="alg3.l11"><tags>
<tag><text fontsize="80%">11:</text></tag>
Expand Down Expand Up @@ -799,7 +799,7 @@
<listingline xml:id="alg4.l4"><tags>
<tag><text fontsize="80%">4:</text></tag>
<tag role="refnum">4</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l5"><tags>
<tag><text fontsize="80%">5:</text></tag>
Expand Down Expand Up @@ -831,32 +831,32 @@
<listingline xml:id="alg4.l10"><tags>
<tag><text fontsize="80%">10:</text></tag>
<tag role="refnum">10</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l11"><tags>
<tag><text fontsize="80%">11:</text></tag>
<tag role="refnum">11</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l12"><tags>
<tag><text fontsize="80%">12:</text></tag>
<tag role="refnum">12</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l13"><tags>
<tag><text fontsize="80%">13:</text></tag>
<tag role="refnum">13</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l14"><tags>
<tag><text fontsize="80%">14:</text></tag>
<tag role="refnum">14</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l15"><tags>
<tag><text fontsize="80%">15:</text></tag>
<tag role="refnum">15</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l16"><tags>
<tag><text fontsize="80%">16:</text></tag>
Expand All @@ -866,22 +866,22 @@
<listingline xml:id="alg4.l17"><tags>
<tag><text fontsize="80%">17:</text></tag>
<tag role="refnum">17</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l18"><tags>
<tag><text fontsize="80%">18:</text></tag>
<tag role="refnum">18</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l19"><tags>
<tag><text fontsize="80%">19:</text></tag>
<tag role="refnum">19</tag>
</tags>     line
</tags>     line
</listingline>
<listingline xml:id="alg4.l20"><tags>
<tag><text fontsize="80%">20:</text></tag>
<tag role="refnum">20</tag>
</tags>    line
</tags>    line
</listingline>
<listingline xml:id="alg4.l21"><tags>
<tag><text fontsize="80%">21:</text></tag>
Expand Down
6 changes: 3 additions & 3 deletions t/fonts/sizes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,10 @@
<p>Math: ‘’ is -1.66663pt x 0.0pt + 0.0pt.</p>
</para>
<para class="ltx_noindent" xml:id="S6.p4">
<p>Math: ‘ ’ is 2.22217pt x 0.0pt + 0.0pt.</p>
<p>Math: ‘ ’ is 2.22217pt x 0.0pt + 0.0pt.</p>
</para>
<para class="ltx_noindent" xml:id="S6.p5">
<p>Math: ‘ ’ is 2.77771pt x 0.0pt + 0.0pt.</p>
<p>Math: ‘ ’ is 2.77771pt x 0.0pt + 0.0pt.</p>
</para>
<para class="ltx_noindent" xml:id="S6.p6">
<p>Math: ‘<Math mode="inline" tex="a" text="a" xml:id="S6.p6.m1">
Expand Down Expand Up @@ -366,7 +366,7 @@
</Math>’ is 18.62154pt x 7.5pt + 2.5pt.</p>
</para>
<para class="ltx_noindent" xml:id="S6.p18">
<p>Math: ‘   ’ is 18.62154pt x 7.5pt + 2.5pt.</p>
<p>Math: ‘   ’ is 18.62154pt x 7.5pt + 2.5pt.</p>
</para>
</section>
<section inlist="toc" xml:id="S7">
Expand Down

0 comments on commit ba0d027

Please sign in to comment.