diff --git a/MANIFEST b/MANIFEST
index da76379dc..4ec9ffbc9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1012,6 +1012,9 @@ t/complex/labelled.latexml
t/complex/physics.pdf
t/complex/physics.tex
t/complex/physics.xml
+t/complex/si_v2.pdf
+t/complex/si_v2.tex
+t/complex/si_v2.xml
t/complex/si.pdf
t/complex/si.tex
t/complex/si.xml
diff --git a/lib/LaTeXML/Package/siunitx.sty.ltxml b/lib/LaTeXML/Package/siunitx.sty.ltxml
index c174f47fb..9808305b4 100644
--- a/lib/LaTeXML/Package/siunitx.sty.ltxml
+++ b/lib/LaTeXML/Package/siunitx.sty.ltxml
@@ -765,6 +765,9 @@ DefMacro('\num OptionalKeyVals:SIX {}', sub {
my $result = six_wrap(six_format_number(six_parse_number($gullet, $number)));
six_end_processing();
return $result; });
+# V3 \num no longer processes complex, nor products, defines two new commands
+Let(T_CS('\complexnum'),T_CS('\num'));
+Let(T_CS('\numproduct'),T_CS('\num'));
# \numlist[options]{number;number;...}
DefMacro('\numlist OptionalKeyVals:SIX {}', sub {
@@ -1158,6 +1161,8 @@ DefMacro('\SI OptionalKeyVals:SIX {}{}', sub {
$fnumber, I_wrap({}, six_process_units($units))));
six_end_processing();
return $result; });
+# V3 \num no longer processes complex, nor products, defines two new commands
+Let(T_CS('\qtyproduct'),T_CS('\si'));
# \SIlist[options]{number;number;...}{units}
DefMacro('\SIlist OptionalKeyVals:SIX {}{}', sub {
diff --git a/t/80_complex.t b/t/80_complex.t
index 901d04a18..8af5c5623 100644
--- a/t/80_complex.t
+++ b/t/80_complex.t
@@ -13,4 +13,8 @@ latexml_tests("t/complex",
texlive_min => 2021},
si => {
env=>'CI', # only runs in continuous integration
- packages => 'siunitx.sty', texlive_min => 2015 } });
+ packages => 'siunitx.sty', texlive_min => 2021 },
+ si_v2 => {
+ env=>'CI', # only runs in continuous integration
+ packages => 'siunitx.sty', texlive_min => 2015 },
+ });
diff --git a/t/complex/si.pdf b/t/complex/si.pdf
index d7fa36ff4..63b2df838 100644
Binary files a/t/complex/si.pdf and b/t/complex/si.pdf differ
diff --git a/t/complex/si.tex b/t/complex/si.tex
index f94d9c5cb..cb1338c12 100644
--- a/t/complex/si.tex
+++ b/t/complex/si.tex
@@ -6,6 +6,10 @@
\usepackage{multirow}
\usepackage{booktabs}
+% recover version 2's {s} column type
+%%\usepackage{collcell}
+%%\newcolumntype{s}{>{\collectcell\si}c<{\endcollectcell}}
+
\DeclareSIQualifier\polymer{pol}
\DeclareSIQualifier\catalyst{cat}
\DeclareSIQualifier\isotropic{i} %?
@@ -22,7 +26,7 @@
\def\mabbra{a}
\DeclareSIUnit\mabbrb{\mabbra}
-\DeclareSIPrefix\killer{\kilo}{3}
+%%\DeclareSIPrefix\killer{\kilo}{3}
\usepackage{amsmath}
\begin{document}
@@ -54,12 +58,12 @@ \subsection{General}
%\num{\sqrt{2}}\\
%\num{{a word}}\\
\num{12345,67890}\\
-\num{1+-2i}\\
+\complexnum{1+-2i}\\
\num{.3e45}\\
-\num{1.654 x 2.34 x 3.430}\\
-\num{\pi}\\
-\num{2\pi}\\
-\num{\pi/3}\\
+\numproduct{1.654 x 2.34 x 3.430}\\
+%%\num{\pi}\\
+%%\num{2\pi}\\
+%%\num{\pi/3}\\
\num{123}\\
\num{1234}\\
@@ -75,19 +79,19 @@ \subsection{General}
\num{123(3)e4}\\
\num{123\pm2}\\
-\num{123\pm2i}\\
-\num{123+234i}\\
+\complexnum{123\pm2i}\\
+\complexnum{123+234i}\\
%\num{123+234}\\
%\num{123e2+234e3i}\\
-\num{123+234ie3}\\
-\num{123(1)+234(1)ie3}\\
+\complexnum{123+234ie3}\\
+\complexnum{123(1)+234(1)ie3}\\
%\num{123e2(1)+234e3i(1)}\\
%\num{+234(1)ie3}\\ %comes out weird?
-\num{+3i}\\
-\num{+3ie4}\\
+\complexnum{+3i}\\
+\complexnum{+3ie4}\\
Pretty nonsensical stuff?
-\num{1.\pi e+3}\\
+%%\num{1.\pi e+3}\\
\def\dig{1234}\\
\num{\dig.\dig}\\
\def\odd{\xi}\\
@@ -95,9 +99,9 @@ \subsection{General}
\num[input-symbols=\xi]{3\xi}\\
\num[input-symbols=\xi]{3\odd}\\
%\num[input-symbols=\odd]{3\odd}\\
-\num[input-symbols=\odd, input-protect-tokens=\odd]{3\odd}\\
-\num[input-symbols=\odd, input-protect-tokens=\odd]{3\odder}\\
-\num[input-symbols=\odder, input-protect-tokens=\odder]{3\odder}\\
+%%\num[input-symbols=\odd, input-protect-tokens=\odd]{3\odd}\\
+%%\num[input-symbols=\odd, input-protect-tokens=\odd]{3\odder}\\
+%%\num[input-symbols=\odder, input-protect-tokens=\odder]{3\odder}\\
%\num[input-symbols=\odder, input-protect-tokens=\odd]{3\odder}\\
%\num[input-symbols=\odd, input-protect-tokens=\odder]{3\odder}\\
@@ -106,7 +110,7 @@ \subsection{General}
\num{1.23\pm0.01}\\
%\num{1.23(1.0)}\\
%\num{1.23(\pm1)}\\
-\num{1.23(\pi)}\\
+%%\num{1.23(\pi)}\\
\subsection{Parsing numbers}
@@ -127,8 +131,8 @@ \subsubsection{input-open-uncertainty, input-close-uncertainty, input-uncertaint
\num{12.3 +- 6}\\
\subsubsection{input-complex-roots}
-\num{9.99 + 88.8i} \\
-\num{9.99 + i88.8}\\
+\complexnum{9.99 + 88.8i} \\
+\complexnum{9.99 + i88.8}\\
\subsubsection{input-protect-tokens}
@@ -158,11 +162,11 @@ \subsubsection{round-mode, round-precision}
}
\subsubsection{round-integer-to-decimal}
{
-\num[round-mode = figures]{1} \\
-\num[round-mode = places]{1} \\
-\sisetup{round-integer-to-decimal}
-\num[round-mode = figures]{1} \\
-\num[round-mode = places]{1}\\
+\num[round-mode = figures, round-precision=1]{1} \\
+\num[round-mode = places, round-precision=0]{1} \\
+%% \sisetup{round-integer-to-decimal}
+%% \num[round-mode = figures]{1} \\
+%% \num[round-mode = places]{1}\\
}
\subsubsection{round-minimum}
@@ -187,12 +191,12 @@ \subsubsection{round-half}
\subsubsection{add-decimal-zero, add-integer-zero}
{
-\num{123.} \\
+\num[minimum-decimal-digits=1]{123.} \\
\num{456} \\
\num{.789} \\
\sisetup{
add-decimal-zero = false,
- add-integer-zero = false,
+%% add-integer-zero = false,
}%
\num{123.} \\
\num{456} \\
@@ -209,8 +213,8 @@ \subsubsection{minimum-integer-digits}
\subsubsection{explicit-sign, retain-explicit-plus}
\num{+345} \\
\num[retain-explicit-plus]{+345} \\
-\num[explicit-sign = -]{345}\\
-\num[explicit-sign = -]{+345}\\
+%%\num[explicit-sign = -]{345}\\
+%%\num[explicit-sign = -]{+345}\\
\subsubsection{retain-unity-mantissa, retain-zero-exponent}
\num{1e4} \\
@@ -256,7 +260,8 @@ \subsubsection{group-digits, group-four-digits,group-seperator}
\num[group-digits= integer]{12345.67890}\\
\num{1234567890.1234567890}\\
-\num[group-four-digits]{1234567890.1234567890}\\
+%%\num[group-four-digits]{1234567890.1234567890}\\
+%%\num[digit-group-size=4]{1234567890.1234567890}\\
\num{12345} \\
\num[group-separator = {,}]{12345} \\
@@ -271,16 +276,16 @@ \subsubsection{group-minimum-digits}
\subsubsection{output-complex-root,output-decimal-marker,copy-complex-root,copy-decimal-marker}
\num{1.23} \\
\num[output-decimal-marker = {,}]{1.23} \\
-\num{1+2i} \\
-\num[output-complex-root = \text{\ensuremath{i}}]{1+2i} \\
-\num[output-complex-root = j]{1+2i} \\
-\num[copy-complex-root]{1+2j} \\
-\num[copy-decimal-marker]{555,555}\\
+\complexnum{1+2i} \\
+\complexnum[output-complex-root = \text{\ensuremath{i}}]{1+2i} \\
+\complexnum[output-complex-root = j]{1+2i} \\
+%%\complexnum[copy-complex-root]{1+2j} \\
+%%\num[copy-decimal-marker]{555,555}\\
\subsubsection{complex-root-position}
-\num{67-0.9i} \\
-\num[complex-root-position = before-number]{67-0.9i} \\
-\num[complex-root-position = after-number]{67-0.9i}\\
+\complexnum{67-0.9i} \\
+\complexnum[complex-root-position = before-number]{67-0.9i} \\
+\complexnum[complex-root-position = after-number]{67-0.9i}\\
\subsubsection{exponent-base, exponent-product}
\num[exponent-product = \times]{1e2} \\
@@ -309,8 +314,8 @@ \subsubsection{separate-uncertainty,uncertainty-separator,output-open-uncertaint
\num[separate-uncertainty]{8.2(13)}\\
\num[separate-uncertainty]{8.2\pm1.3} \\
-\num{1.234(5) x \pi} \\
-\num[separate-uncertainty = true]{1.234(5) x \pi} \\
+%%\num{1.234(5) x \pi} \\
+%\num[separate-uncertainty = true]{1.234(5) x \pi} \\
\num{1.2 +- 0.001}\\
\num[separate-uncertainty]{1.2 +- 0.001}\\
@@ -318,14 +323,14 @@ \subsubsection{separate-uncertainty,uncertainty-separator,output-open-uncertaint
\subsubsection{bracket-numbers, open-bracket, close-bracket}
{
\num{1 e10} \\
-\num{2i e10} \\
-\num{1+2i e10} \\
-\num[bracket-numbers = false]{1+2i e10} \\
-\sisetup{
- open-bracket = \{,
- close-bracket = \},
-}
-\num{1+2i e10}\\
+\complexnum{2i e10} \\
+\complexnum{1+2i e10} \\
+\complexnum[bracket-numbers = false]{1+2i e10} \\
+%%\sisetup{
+%% open-bracket = \{,
+%% close-bracket = \},
+%%}
+%%\complexnum{1+2i e10}\\
}
\subsubsection{negative-color}
@@ -341,28 +346,28 @@ \subsubsection{bracket-negative-numbers}
\subsection{Multi-part Numbers}
\subsubsection{input-product,input-quotient}
-\num{1 x 2 x 3} \\
-\num{1e4 x 2(3) x 3/4} \\
-\num[input-product=*]{4 * 5 * 6} \\
-\num{ 1 / 2e4 } \\
-\num{ 1e2 / 3e4 }\\
-
-\subsubsection{output-product, output-quotient}
-\num[output-product = \cdot]{4.87 x 5.321 x 6.90545} \\
-\num[output-quotient = \text{ div }]{1 / 2}\\
-
-\subsubsection{quotient-mode}
-\num{1 / 2e4} \\
-\num[quotient-mode = fraction]{1 / 2e4}\\
-
-\subsubsection{fraction-function}
-{
-\sisetup{quotient-mode= fraction}
-\num{1 / 1}\\
-\num[fraction-function= \dfrac]{1 / 2}\\
-%\num[fraction-function= \sfrac]{1 / 3}\\
-\num[fraction-function= \tfrac]{1 / 4}\\
-}
+\numproduct{1 x 2 x 3} \\
+%%\numproduct{1e4 x 2(3) x 3/4} \\
+%%\numproduct[input-product=*]{4 * 5 * 6} \\
+%%\num{ 1 / 2e4 } \\
+%%\num{ 1e2 / 3e4 }\\
+
+%%\subsubsection{output-product, output-quotient}
+%%\numproduct[output-product = \cdot]{4.87 x 5.321 x 6.90545} \\
+%%\num[output-quotient = \text{ div }]{1 / 2}\\
+
+%%\subsubsection{quotient-mode}
+%%\num{1 / 2e4} \\
+%%\num[quotient-mode = fraction]{1 / 2e4}\\
+
+%%\subsubsection{fraction-function}
+%%{
+%%\sisetup{quotient-mode= fraction}
+%%\num{1 / 1}\\
+%%\num[fraction-function= \dfrac]{1 / 2}\\
+%%%\num[fraction-function= \sfrac]{1 / 3}\\
+%%\num[fraction-function= \tfrac]{1 / 4}\\
+%%}
\subsection{Lists and ranges of numbers}
\subsubsection{list-final-separator,list-pair-separator,list-separator}
@@ -491,16 +496,16 @@ \section{Units}
\centering
\begin{tabular}{lll}\hline\hline
Unit & Macro & Symbol \\\hline
-\showunit{astronomicalunit}\\
-\showunit{atomicmassunit}\\
-\showunit{bohr}\\
-\showunit{clight}\\
+%%\showunit{astronomicalunit}\\
+%%\showunit{atomicmassunit}\\
+%%\showunit{bohr}\\
+%%\showunit{clight}\\
\showunit{dalton}\\
-\showunit{electronmass}\\
+%%\showunit{electronmass}\\
\showunit{electronvolt}\\
-\showunit{elementarycharge}\\
-\showunit{hartree}\\
-\showunit{planckbar}\\
+%%\showunit{elementarycharge}\\
+%%\showunit{hartree}\\
+%%\showunit{planckbar}\\
\end{tabular}
\end{table}
@@ -509,19 +514,19 @@ \section{Units}
\centering
\begin{tabular}{lll}\hline\hline
Unit & Macro & Symbol \\\hline
-\showunit{angstrom}\\
-\showunit{bar}\\
-\showunit{barn}\\
+%%\showunit{angstrom}\\
+%%\showunit{bar}\\
+%%\showunit{barn}\\
\showunit{bel}\\
\showunit{decibel}\\
-\showunit{knot}\\
-\showunit{mmHg}\\
-\showunit{nauticalmile}\\
+%%\showunit{knot}\\
+%%\showunit{mmHg}\\
+%%\showunit{nauticalmile}\\
\showunit{neper}\\
\end{tabular}
\end{table}
-\def\showprefix#1{#1 & \texttt{\Backslash#1} & \si{\csname#1\endcsname} & \si[prefixes-as-symbols=false]{\csname#1\endcsname}}
+\def\showprefix#1{#1 & \texttt{\Backslash#1} & \si{\csname#1\endcsname\meter} & \si[prefixes-as-symbols=false]{\csname#1\endcsname\meter}}
\begin{table}
\caption{Other non-SI units}
\centering
@@ -554,7 +559,7 @@ \section{Units}
\showunit{mg}\\
\showunit{g}\\
\showunit{kg}\\
-\showunit{amu}\\\hline
+%%\showunit{amu}\\\hline
\showunit{pm}\\
\showunit{nm}\\
\showunit{um}\\
@@ -663,11 +668,11 @@ \subsection{Using units}
% Not allowed.
%\si{\kilo\kilogram}
%\si{\kilo\kilo\gram}
-{
-% and note that regular macros ARE expanded!
-\def\killermeater{\kilo\meter}
-\si{\killermeater}
-}
+%%{
+%%% and note that regular macros ARE expanded!
+%%\def\killermeater{\kilo\meter}
+%%\si{\killermeater}
+%%}
{
% BUT, it prefers its OWN definitions!
\def\gram{Grr}
@@ -685,7 +690,7 @@ \subsection{Using units}
\si{\mabbra}\\
\si{\mabbrb}\\
-\si{\killer\meter}\\
+%%\si{\killer\meter}\\
% Where can highlight go?
\si{\highlight{red}\kilo\gram\metre\per\second} \\
@@ -744,13 +749,13 @@ \subsubsection{sticky-per}
\si{\pascal\per\gray\henry} \\
\si[sticky-per]{\pascal\per\gray\henry}\\
-\subsubsection{power-font}
-\si{\metre\per\second\squared} \\
-\si[power-font = unit]{\metre\per\second\squared}\\
+%%\subsubsection{power-font}
+%%\si{\metre\per\second\squared} \\
+%%\si[power-font = unit]{\metre\per\second\squared}\\
-\subsubsection{literal-superscript-as-power}
-\si{m.s^{2}} \\
-\si[literal-superscript-as-power = false]{m.s^{2}}\\
+%%\subsubsection{literal-superscript-as-power}
+%%\si{m.s^{2}} \\
+%\si[literal-superscript-as-power = false]{m.s^{2}}\\
\subsubsection{qualifier-mode, qualifier-phrase}
\si{\kilogram\polymer\squared\per\mole\catalyst\per\hour} \\
@@ -812,12 +817,12 @@ \subsubsection{multi-part-units}
\SI{1.234(5)e-4}{\metre}\\
}
\subsubsection{product-units}
-\SI{2 x 3 x 4}{\metre} \\
-\SI[product-units = brackets]{2 x 3 x 4}{\metre}\\
-\SI[product-units = brackets-power]{2 x 3 x 4}{\metre}\\
-\SI[product-units = power]{2 x 3 x 4}{\metre}\\
-\SI[product-units = repeat]{2 x 3 x 4}{\metre}\\
-\SI[product-units = single]{2 x 3 x 4}{\metre}\\
+\qtyproduct{2 x 3 x 4}{\metre} \\
+\qtyproduct[product-units = brackets]{2 x 3 x 4}{\metre}\\
+%%\qtyproduct[product-units = brackets-power]{2 x 3 x 4}{\metre}\\
+\qtyproduct[product-units = power]{2 x 3 x 4}{\metre}\\
+\qtyproduct[product-units = repeat]{2 x 3 x 4}{\metre}\\
+\qtyproduct[product-units = single]{2 x 3 x 4}{\metre}\\
\subsubsection{list-units,range-units}
\SIlist{2;4;6;8}{\tesla} \\
@@ -918,37 +923,37 @@ \section{Tabular material}
\end{tabular}
\end{table}
-\begin{table}[H]
-\centering
-\caption{Units in tables.}
-\label{tab:s:demo}
-\begin{tabular}{s}
-\toprule
-\multicolumn{1}{c}{Unit} \\
-\midrule
-\metre\squared\per\second \\
-\pascal \\
-m.s^{-1} \\
-\bottomrule
-\end{tabular}
-\end{table}
-
-\begin{table}[H]
-\centering
-\caption{The \texttt{s} column processes everything.}
-\label{tab:s:processing}
-\sisetup{color = orange}
-\begin{tabular}{ss}
-\toprule
-{Unit}
-& \multicolumn{1}{c}{Unit}\\
-\midrule
-{\si{m^3}} & \multicolumn{1}{c}{\si{m^3}} \\
-\kilogram
-& \kilogram \\
-\bottomrule
-\end{tabular}
-\end{table}
+% % \begin{table}[H]
+% % \centering
+% % \caption{Units in tables.}
+% % \label{tab:s:demo}
+% % \begin{tabular}{s}
+% % \toprule
+% % \multicolumn{1}{c}{Unit} \\
+% % \midrule
+% % \metre\squared\per\second \\
+% % \pascal \\
+% % m.s^{-1} \\
+% % \bottomrule
+% % \end{tabular}
+% % \end{table}
+
+% % \begin{table}[H]
+% % \centering
+% % \caption{The \texttt{s} column processes everything.}
+% % \label{tab:s:processing}
+% % \sisetup{color = orange}
+% % \begin{tabular}{ss}
+% % \toprule
+% % {Unit}
+% % & \multicolumn{1}{c}{Unit}\\
+% % \midrule
+% % {\si{m^3}} & \multicolumn{1}{c}{\si{m^3}} \\
+% % \kilogram
+% % & \kilogram \\
+% % \bottomrule
+% % \end{tabular}
+% % \end{table}
\subsubsection{table-parse-only}
\begin{table}[H]
@@ -1335,58 +1340,58 @@ \subsubsection{table-text-alignment}
\end{tabular}
\end{table}
-\subsubsection{table-unit-alignment}
-\begin{table}[H]
-\centering
-\caption{Alignment options in \texttt{s} columns.}
-\label{tab:s:align}
-\begin{tabular}
-{
-s[table-unit-alignment = right]
-s
-s[table-unit-alignment = left]
-}
-\toprule
-{Right-aligned} &
-{Centred text} &
-{Left-aligned} \\
-\midrule
-\metre\per\second & \metre\per\second & \metre\per\second \\
-\kilogram
-& \kilogram
-& \kilogram
-\\
-\bottomrule
-\end{tabular}
-\end{table}
-
-\subsubsection{table-alignment}
-
-\subsubsection{table-column-width}
-\begin{table}[H]
-\centering
-\caption{Fixed-width columns.}
-\label{tab:width:fixed}
-\begin{tabular}
-{
-s
-s[table-column-width = 2 cm]
-S
-S[table-column-width = 2 cm]
-}
-\toprule
-{Flexible} &
-{Fixed}
-&
-{Flexible} &
-{Fixed}
-\\
-\midrule
-\metre\per\second & \metre\per\second & 1.23 & 1.23 \\
-\kilogram\candela & \kilogram\candela & 45.6 & 45.6 \\
-\bottomrule
-\end{tabular}
-\end{table}
+% % \subsubsection{table-unit-alignment}
+% % \begin{table}[H]
+% % \centering
+% % \caption{Alignment options in \texttt{s} columns.}
+% % \label{tab:s:align}
+% % \begin{tabular}
+% % {
+% % s[table-unit-alignment = right]
+% % s
+% % s[table-unit-alignment = left]
+% % }
+% % \toprule
+% % {Right-aligned} &
+% % {Centred text} &
+% % {Left-aligned} \\
+% % \midrule
+% % \metre\per\second & \metre\per\second & \metre\per\second \\
+% % \kilogram
+% % & \kilogram
+% % & \kilogram
+% % \\
+% % \bottomrule
+% % \end{tabular}
+% % \end{table}
+
+% % \subsubsection{table-alignment}
+
+% % \subsubsection{table-column-width}
+% % \begin{table}[H]
+% % \centering
+% % \caption{Fixed-width columns.}
+% % \label{tab:width:fixed}
+% % \begin{tabular}
+% % {
+% % s
+% % s[table-column-width = 2 cm]
+% % S
+% % S[table-column-width = 2 cm]
+% % }
+% % \toprule
+% % {Flexible} &
+% % {Fixed}
+% % &
+% % {Flexible} &
+% % {Fixed}
+% % \\
+% % \midrule
+% % \metre\per\second & \metre\per\second & 1.23 & 1.23 \\
+% % \kilogram\candela & \kilogram\candela & 45.6 & 45.6 \\
+% % \bottomrule
+% % \end{tabular}
+% % \end{table}
% \begin{table}[H]
% \centering
diff --git a/t/complex/si.xml b/t/complex/si.xml
index ce47e4810..174733e1d 100644
--- a/t/complex/si.xml
+++ b/t/complex/si.xml
@@ -244,29 +244,6 @@ Some text
-
-
-
-
- atomicmassunit
-
-
-
-
- bohr
-
-
-
-
- clight
-
-
-
-
- dalton
-
- dalton
+
+
-
electronmass
-
-
-
- electronvolt
-
-
- elementarycharge
-
-
-
-
- hartree
-
-
-
-
@@ -3467,36 +2909,9 @@ Some text planckbar
-
-
-
-
-
-
-
- bar
-
-
-
-
- barn
-
-
-
-
- bel
-
- bel
+
+
-
-
- knot
-
-
-
-
- mmHg
-
-
-
-
nauticalmile
-
-
-
- neper
-
-
- deca
-
-
@@ -3617,12 +3005,12 @@ Some text
-
- hecto
-
-
@@ -3659,12 +3047,12 @@ Some text
-
- kilo
-
-
@@ -3701,12 +3089,12 @@ Some text
-
- mega
-
-
@@ -3743,12 +3131,12 @@ Some text
-
- giga
-
-
@@ -3785,12 +3173,12 @@ Some text
-
- tera
-
-
@@ -3827,12 +3215,16 @@ Some text
-
- peta
-
-
@@ -3869,12 +3261,12 @@ Some text
-
- exa
-
-
@@ -3911,12 +3303,12 @@ Some text
-
- zetta
-
-
@@ -3953,12 +3345,12 @@ Some text
-
- yotta
-
-
-
@@ -4080,18 +3472,9 @@ Some text
-
-
- pm
-
- pm
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4805,7 +4188,7 @@ Some text
-
-
-
-
-
-
-
@@ -4893,12 +4276,12 @@ Some text
-
-
@@ -4915,12 +4298,12 @@ Some text
-
-
@@ -4937,12 +4320,12 @@ Some text
-
-
@@ -4959,12 +4342,12 @@ Some text
-
-
@@ -4981,12 +4364,12 @@ Some text
-
-
@@ -5003,12 +4386,12 @@ Some text
-
-
@@ -5025,12 +4408,12 @@ Some text
-
-
@@ -5067,17 +4450,9 @@ Some text