summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/publ-imp-page.mkvi
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/publ-imp-page.mkvi')
-rw-r--r--Master/texmf-dist/tex/context/base/publ-imp-page.mkvi41
1 files changed, 7 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/context/base/publ-imp-page.mkvi b/Master/texmf-dist/tex/context/base/publ-imp-page.mkvi
index f0b92c88cc5..2d9040b105a 100644
--- a/Master/texmf-dist/tex/context/base/publ-imp-page.mkvi
+++ b/Master/texmf-dist/tex/context/base/publ-imp-page.mkvi
@@ -13,45 +13,17 @@
\unprotect
-\definebtx
- [\s!page] % or just outer level
- [\c!pagestate=\v!stop,
- \c!pageleft=\btxleftparenthesis, % see below!!
- \c!pageright=\btxrightparenthesis,
- \c!pagesep={,\space},
- \c!lastpagesep={,\space\btxlabeltext{\currentbtxspecification:and}\space},
- \c!finalpagesep={\space\btxlabeltext{\currentbtxspecification:and}\space},
- \c!pageconnector=\endash]
-
-\definebtx
- [\s!page:\s!list]
- [\s!page]
- [\c!pagecommand={\wordright}]
-
-\startsetups \s!btx:\s!page:concat
+\startsetups \s!btx:\s!list:\s!page:concat
\ifcase\currentbtxoverflow
- \ifcase\currentbtxconcat
- \or % first
- \or % second
- \btxparameter\c!pagesep
- \or % second of two
- \btxparameter\c!lastpagesep
- \or % last
- \btxparameter\c!finalpagesep
- \fi
+ \btxparameter{\c!separator:\number\currentbtxconcat}
\fi
\stopsetups
% for the moment we have only one variant
\startsetups [\s!btx:\s!list:\s!page]
- \fastsetup{\s!btx:\s!page:concat}
- % \ifx\currentbtxlastpage\empty
- % p.
- % \else
- % pp.
- % \fi
- % \btxnbsp
+ \fastsetup{\s!btx:\s!list:\s!page:concat}
+ \fastsetup{\s!btx:\currentbtxspecification:\s!list:page-or-pages}
\ifconditional\btxinteractive
\goto {
\currentbtxfirstpage
@@ -59,7 +31,8 @@
internal(\currentbtxfirstinternal)
]
\ifx\currentbtxlastpage\empty \else
- \btxparameter\c!pageconnector
+ %\btxparameter\c!pageconnector
+ \btxparameter\c!range
\goto {
\currentbtxlastpage
} [
@@ -69,7 +42,7 @@
\else
\currentbtxfirstpage
\ifx\currentbtxlastpage\empty \else
- \btxparameter\c!pageconnector
+ \btxparameter\c!range
\currentbtxlastpage
\fi
\fi