diff options
| author | Marius <mariausol@gmail.com> | 2012-11-23 19:00:16 +0200 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2012-11-23 19:00:16 +0200 |
| commit | 7bd57701b696956d241d5f3fec8cc6288082cf5c (patch) | |
| tree | 42d010bd7d0341ae5a2de47ddc17cd11f9eb5780 /tex/context/base/phys-dim.lua | |
| parent | da000c7dffd8a5325a69719607bdc5307dc73100 (diff) | |
| download | context-7bd57701b696956d241d5f3fec8cc6288082cf5c.tar.gz | |
beta 2012.11.23 17:35
Diffstat (limited to 'tex/context/base/phys-dim.lua')
| -rw-r--r-- | tex/context/base/phys-dim.lua | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tex/context/base/phys-dim.lua b/tex/context/base/phys-dim.lua index 5b883ac88..88a522195 100644 --- a/tex/context/base/phys-dim.lua +++ b/tex/context/base/phys-dim.lua @@ -82,8 +82,16 @@ local space = P(" ") local lparent = P("(") local rparent = P(")") +local lbrace = P("{") +local rbrace = P("}") + local digits = digit^1 +local powerdigits = plus * C(digits) / context.digitspowerplus + + minus * C(digits) / context.digitspowerminus + + C(digits) / context.digitspower + + local ddigitspace = digitspace / "" / context.digitsspace local ddigit = digits / context.digitsdigit local dsemicomma = semicolon / "" / context.digitsseparatorspace @@ -100,11 +108,8 @@ local dnegative = negative / "" / context.digitsnegative local dhighspace = highspace / "" / context.digitshighspace local dsomesign = plus / "" / context.digitsplus + minus / "" / context.digitsminus -local dpower = power / "" * ( - plus * C(digits) / context.digitspowerplus - + minus * C(digits) / context.digitspowerminus - + C(digits) / context.digitspower - ) +local dpower = power / "" * ( powerdigits + lbrace * powerdigits * rbrace ) + local dpadding = padding / "" / context.digitszeropadding -- todo local dleader = (dpositive + dnegative + dhighspace + dsomesign + dsignspace)^0 |