diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-08 00:43:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-08 00:43:40 +0000 |
commit | 824f7b0903de8ad7f6ee3d7656005e4c59155e06 (patch) | |
tree | abfc8673ef9916f3ab7074e811207384c301492b /Master/texmf-dist/tex/context/base/phys-dim.mkiv | |
parent | 689aefb0727676ed3cddf331337b4be226495e72 (diff) |
context import for TL13, from www.pragma-ade.com/context/beta/cont-tmf.zip
git-svn-id: svn://tug.org/texlive/trunk@29731 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/phys-dim.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/phys-dim.mkiv | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/context/base/phys-dim.mkiv b/Master/texmf-dist/tex/context/base/phys-dim.mkiv index 84c3c7a2a05..4efaa65a8a9 100644 --- a/Master/texmf-dist/tex/context/base/phys-dim.mkiv +++ b/Master/texmf-dist/tex/context/base/phys-dim.mkiv @@ -216,10 +216,15 @@ \unexpanded\def\digitsperiodsymbol {\csname\??digitsperiod\number\c_phys_digits_method\endcsname} \unexpanded\def\digitsseparatorspace {\csname\??digitsspace \number\c_phys_digits_method\endcsname} -\unexpanded\def\digitsfinalcomma {\digitscommasymbol } % more for tracing +% \unexpanded\def\digitsfinalcomma {\digitscommasymbol } % more for tracing +% \unexpanded\def\digitsfinalperiod {\digitsperiodsymbol} % more for tracing +% \unexpanded\def\digitsintermediatecomma {\digitscommasymbol } % more for tracing +% \unexpanded\def\digitsintermediateperiod {\digitsperiodsymbol} % more for tracing + +\unexpanded\def\digitsfinalcomma {\digitsperiodsymbol} % more for tracing \unexpanded\def\digitsfinalperiod {\digitsperiodsymbol} % more for tracing \unexpanded\def\digitsintermediatecomma {\digitscommasymbol } % more for tracing -\unexpanded\def\digitsintermediateperiod {\digitsperiodsymbol} % more for tracing +\unexpanded\def\digitsintermediateperiod {\digitscommasymbol } % more for tracing %D The user macro: @@ -403,6 +408,10 @@ \newtoks \everyunits % we keep the old \units command so we need a longer one \appendtoks + \disablemathpunctuation +\to \everyunits + +\appendtoks \setuevalue\currentunit{\phys_units_direct{\currentunit}} \to \everydefineunit @@ -539,6 +548,16 @@ \fi \c_phys_units_state\plusfive} +% This is a hack: for some reason \unit{micro meter} like patterns give +% \unitsNstart\unitsNstop so there is a buglet in the parser + +\let\unitsNstartindeed\unitsNstart + +\unexpanded\def\unitsNstart + {\doifnextcharelse\unitsNstop\gobbleoneargument\unitsNstartindeed} + +% End of hack. + \unexpanded\def\unitsNspace {\space} @@ -639,12 +658,10 @@ \definelabelclass [prefix] [2] \definelabelclass [suffix] [2] % This is only a label because we want to show them in a table. -\ctxlua{ - languages.labels.define("setupprefixtext","prefixes")% - languages.labels.define("setupunittext","units")% - languages.labels.define("setupoperatortext","operators")% - languages.labels.define("setupsuffixtext","suffixes")% -} +\ctxcommand{definelabels("prefix", "prefixes" )} +\ctxcommand{definelabels("unit", "units" )} +\ctxcommand{definelabels("operator","operators")} +\ctxcommand{definelabels("suffix", "suffixes" )} %D You can define additional units: %D |