summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3skip.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3skip.dtx33
1 files changed, 17 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
index f7af3985dd1..abd4bac865d 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
%% File: l3skip.dtx Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project
-%% (C) 2012,2013 The LaTeX3 Project
+%% (C) 2012-2014 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -34,13 +34,14 @@
%%
%% -----------------------------------------------------------------------
%
+%<*driver>
+\documentclass[full]{l3doc}
+%</driver>
%<*driver|package>
-\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3skip.dtx 4581 2013-07-28 08:38:50Z joseph $
+\GetIdInfo$Id: l3skip.dtx 4738 2014-05-05 08:00:05Z joseph $
{L3 Dimensions and skips}
%</driver|package>
%<*driver>
-\documentclass[full]{l3doc}
\begin{document}
\DocInput{\jobname.dtx}
\end{document}
@@ -936,14 +937,6 @@
%<@@=dim>
% \end{macrocode}
%
-% \begin{macrocode}
-%<*package>
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\__expl_package_check:
-%</package>
-% \end{macrocode}
-%
% \subsection{Length primitives renamed}
%
% \begin{macro}{\if_dim:w}
@@ -968,7 +961,7 @@
\cs_new_protected:Npn \dim_new:N #1
{
\__chk_if_free_cs:N #1
- \newdimen #1
+ \cs:w newdimen \cs_end: #1
}
%</package>
\cs_generate_variant:Nn \dim_new:N { c }
@@ -1351,9 +1344,17 @@
% \end{macro}
%
% \begin{macro}[EXP, int]{\@@_strip_bp:n}
+% Conversion to big points is done using a scaling inside \cs{__dim_eval:w}
+% as \eTeX{} does that using $64$-bit precision. Here, $800/803$ is the
+% integer fraction for $72/72.27$.
% \begin{macrocode}
\cs_new:Npn \@@_strip_bp:n #1
- { \@@_strip_pt:n { 0.996 26 \@@_eval:w #1 \@@_eval_end: } }
+ {
+ \__dim_strip_pt:n
+ {
+ \__dim_eval:w ( #1 ) * 800 / 803 \__dim_eval_end:
+ }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -1446,7 +1447,7 @@
\cs_new_protected:Npn \skip_new:N #1
{
\__chk_if_free_cs:N #1
- \newskip #1
+ \cs:w newskip \cs_end: #1
}
%</package>
\cs_generate_variant:Nn \skip_new:N { c }
@@ -1687,7 +1688,7 @@
\cs_new_protected:Npn \muskip_new:N #1
{
\__chk_if_free_cs:N #1
- \newmuskip #1
+ \cs:w newmuskip \cs_end: #1
}
%</package>
\cs_generate_variant:Nn \muskip_new:N { c }