Permalink
Browse files

Move \c_undefined_fp to l3fp-old, hence move l3fp-old to the end.

The definition of \c_undefined_fp requires the fp package to be
almost entirely set up, so we load that at the end of the l3fp
bundle.


git-svn-id: svn+ssh://comedy.dante.de/serv/latex-project/svn/experimental/trunk@3710 de43f980-851b-0410-b2f7-c40aca1f87e0
  • Loading branch information...
1 parent 6c670d1 commit 4d8b141afd81ca7b5333eaef47dfa3041eafd58b bruno committed May 28, 2012
View
@@ -59,7 +59,6 @@ Do not distribute a modified version of this file.
\file{l3fp.sty}
{%
\from{l3fp.dtx} {package}
- \from{l3fp-old.dtx} {package}
\from{l3fp-aux.dtx} {package}
\from{l3fp-round.dtx} {package}
\from{l3fp-parse.dtx} {package}
@@ -70,6 +69,7 @@ Do not distribute a modified version of this file.
\from{l3fp-trig.dtx} {package}
\from{l3fp-convert.dtx} {package}
\from{l3fp-assign.dtx} {package}
+ \from{l3fp-old.dtx} {package}
}%
}
\generate{\file{l3box.sty} {\from{l3box.dtx} {package}}}
@@ -59,7 +59,6 @@ Do not distribute a modified version of this file.
\from{l3skip.dtx} {initex}
\from{l3keys.dtx} {initex}
\from{l3fp.dtx} {initex}
- \from{l3fp-old.dtx} {initex}
\from{l3fp-aux.dtx} {initex}
\from{l3fp-round.dtx} {initex}
\from{l3fp-parse.dtx} {initex}
@@ -70,6 +69,7 @@ Do not distribute a modified version of this file.
\from{l3fp-trig.dtx} {initex}
\from{l3fp-convert.dtx} {initex}
\from{l3fp-assign.dtx} {initex}
+ \from{l3fp-old.dtx} {initex}
\from{l3box.dtx} {initex}
\from{l3coffins.dtx} {initex}
\from{l3color.dtx} {initex}
@@ -212,15 +212,6 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\c_undefined_fp}
-% ^^A todo: remove.
-% For compatibility, we also define \cs{c_undefined_fp} as a
-% \texttt{nan}.
-% \begin{macrocode}
-\fp_const:Nn \c_undefined_fp { nan }
-% \end{macrocode}
-% \end{variable}
-%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
View
@@ -78,8 +78,17 @@
%
% \subsection{Compatibility}
%
+% \begin{variable}{\c_undefined_fp}
+% The old floating point number \cs{c_undefined_fp} is now implemented
+% as a \texttt{nan}.
+% \begin{macrocode}
+\fp_const:Nn \c_undefined_fp { nan }
+% \end{macrocode}
+% \end{variable}
+%
% \begin{macro}[pTF]{\fp_if_undefined:N}
-% An old floating point is undefined if it is \texttt{inf} or \texttt{nan}.
+% An old floating point is undefined if it is \texttt{inf} or
+% \texttt{nan}, \emph{i.e.}, if its type is $2$ or $3$.
% \begin{macrocode}
\prg_new_conditional:Npnn \fp_if_undefined:N #1 { p , T , F , TF }
{ \exp_after:wN \fp_if_undefined_aux:w #1 }
@@ -89,12 +98,13 @@
% \end{macro}
%
% \begin{macro}[pTF]{\fp_if_zero:N}
-% An old floating point is zero if it is $\pm 0$.
+% An old floating point is zero if it is $\pm 0$, \emph{i.e.}, its
+% type is $0$.
% \begin{macrocode}
\prg_new_conditional:Npnn \fp_if_zero:N #1 { p , T , F , TF }
{ \exp_after:wN \fp_if_zero_aux:w #1 }
\cs_new:Npn \fp_if_zero_aux:w \s_fp \fp_use:w #1#2;
- { \if_num:w #1 = \c_zero \prg_return_true: \else: \prg_return_false: \fi: }
+ { \if_meaning:w #1 0 \prg_return_true: \else: \prg_return_false: \fi: }
% \end{macrocode}
% \end{macro}
%
@@ -425,17 +425,20 @@ \section{\TeX{} concepts not supported by \LaTeX3{}}
% part only, they have to be added to the documentation list after typesetting
% the 'user' part just for the main module.
\ExplSyntaxOn
-\clist_gput_right:Nn \g_docinput_clist { l3fp-old.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-aux.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-round.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-parse.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-logic.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-basics.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-extended.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-expo.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-trig.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-convert.dtx }
-\clist_gput_right:Nn \g_docinput_clist { l3fp-assign.dtx }
+\clist_gput_right:Nn \g_docinput_clist
+ {
+ l3fp-aux.dtx ,
+ l3fp-round.dtx ,
+ l3fp-parse.dtx ,
+ l3fp-logic.dtx ,
+ l3fp-basics.dtx ,
+ l3fp-extended.dtx ,
+ l3fp-expo.dtx ,
+ l3fp-trig.dtx ,
+ l3fp-convert.dtx ,
+ l3fp-assign.dtx ,
+ l3fp-old.dtx ,
+ }
\ExplSyntaxOff
\DocInput{l3luatex.dtx}
@@ -2643,82 +2643,6 @@ Defining message LaTeX/keys/property-unknown on line ...
Defining message LaTeX/keys/value-forbidden on line ...
Defining message LaTeX/keys/value-required on line ...
) (l3fp.sty
-Defining \fp_if_undefined_p:N on line ...
-Defining \fp_if_undefined:NT on line ...
-Defining \fp_if_undefined:NF on line ...
-Defining \fp_if_undefined:NTF on line ...
-Defining \fp_if_undefined_aux:w on line ...
-Defining \fp_if_zero_p:N on line ...
-Defining \fp_if_zero:NT on line ...
-Defining \fp_if_zero:NF on line ...
-Defining \fp_if_zero:NTF on line ...
-Defining \fp_if_zero_aux:w on line ...
-Defining \fp_assign_self:NNN on line ...
-Defining \fp_abs:N on line ...
-Defining \fp_gabs:N on line ...
-Defining \fp_abs:c on line ...
-Defining \fp_gabs:c on line ...
-Defining \fp_neg:N on line ...
-Defining \fp_gneg:N on line ...
-Defining \fp_neg:c on line ...
-Defining \fp_gneg:c on line ...
-Defining \fp_assign_with:NNNn on line ...
-Defining \fp_add:Nn on line ...
-Defining \fp_gadd:Nn on line ...
-Defining \fp_add:cn on line ...
-Defining \fp_gadd:cn on line ...
-Defining \fp_sub:Nn on line ...
-Defining \fp_gsub:Nn on line ...
-Defining \fp_sub:cn on line ...
-Defining \fp_gsub:cn on line ...
-Defining \fp_mul:Nn on line ...
-Defining \fp_gmul:Nn on line ...
-Defining \fp_mul:cn on line ...
-Defining \fp_gmul:cn on line ...
-Defining \fp_div:Nn on line ...
-Defining \fp_gdiv:Nn on line ...
-Defining \fp_div:cn on line ...
-Defining \fp_gdiv:cn on line ...
-Defining \fp_pow:Nn on line ...
-Defining \fp_gpow:Nn on line ...
-Defining \fp_pow:cn on line ...
-Defining \fp_gpow:cn on line ...
-Defining \fp_exp:Nn on line ...
-Defining \fp_gexp:Nn on line ...
-Defining \fp_exp:cn on line ...
-Defining \fp_gexp:cn on line ...
-Defining \fp_ln:Nn on line ...
-Defining \fp_gln:Nn on line ...
-Defining \fp_ln:cn on line ...
-Defining \fp_gln:cn on line ...
-Defining \fp_sin:Nn on line ...
-Defining \fp_gsin:Nn on line ...
-Defining \fp_sin:cn on line ...
-Defining \fp_gsin:cn on line ...
-Defining \fp_cos:Nn on line ...
-Defining \fp_gcos:Nn on line ...
-Defining \fp_cos:cn on line ...
-Defining \fp_gcos:cn on line ...
-Defining \fp_tan:Nn on line ...
-Defining \fp_gtan:Nn on line ...
-Defining \fp_tan:cn on line ...
-Defining \fp_gtan:cn on line ...
-Defining \fp_assign_to:nNNNn on line ...
-Defining \fp_assign_to_i:wNNNn on line ...
-Defining \fp_assign_to_ii:NnNNN on line ...
-Defining \fp_compare:NNNTF on line ...
-Defining \fp_compare:NNNT on line ...
-Defining \fp_compare:NNNF on line ...
-Defining \fp_compare_p:NNN on line ...
-Defining \fp_round_places:Nn on line ...
-Defining \fp_ground_places:Nn on line ...
-Defining \fp_round_places_aux:NNn on line ...
-Defining \fp_round_places:cn on line ...
-Defining \fp_ground_places:cn on line ...
-Defining \fp_round_figures:Nn on line ...
-Defining \fp_ground_figures:Nn on line ...
-Defining \fp_round_figures:cn on line ...
-Defining \fp_ground_figures:cn on line ...
Defining \c_twenty_six on line ...
Defining \s_fp on line ...
Defining \fp_use:w on line ...
@@ -3321,6 +3245,82 @@ Defining \c_one_fp on line ...
Defining \c_pi_fp on line ...
Defining \c_one_degree_fp on line ...
Defining \c_undefined_fp on line ...
+Defining \fp_if_undefined_p:N on line ...
+Defining \fp_if_undefined:NT on line ...
+Defining \fp_if_undefined:NF on line ...
+Defining \fp_if_undefined:NTF on line ...
+Defining \fp_if_undefined_aux:w on line ...
+Defining \fp_if_zero_p:N on line ...
+Defining \fp_if_zero:NT on line ...
+Defining \fp_if_zero:NF on line ...
+Defining \fp_if_zero:NTF on line ...
+Defining \fp_if_zero_aux:w on line ...
+Defining \fp_assign_self:NNN on line ...
+Defining \fp_abs:N on line ...
+Defining \fp_gabs:N on line ...
+Defining \fp_abs:c on line ...
+Defining \fp_gabs:c on line ...
+Defining \fp_neg:N on line ...
+Defining \fp_gneg:N on line ...
+Defining \fp_neg:c on line ...
+Defining \fp_gneg:c on line ...
+Defining \fp_assign_with:NNNn on line ...
+Defining \fp_add:Nn on line ...
+Defining \fp_gadd:Nn on line ...
+Defining \fp_add:cn on line ...
+Defining \fp_gadd:cn on line ...
+Defining \fp_sub:Nn on line ...
+Defining \fp_gsub:Nn on line ...
+Defining \fp_sub:cn on line ...
+Defining \fp_gsub:cn on line ...
+Defining \fp_mul:Nn on line ...
+Defining \fp_gmul:Nn on line ...
+Defining \fp_mul:cn on line ...
+Defining \fp_gmul:cn on line ...
+Defining \fp_div:Nn on line ...
+Defining \fp_gdiv:Nn on line ...
+Defining \fp_div:cn on line ...
+Defining \fp_gdiv:cn on line ...
+Defining \fp_pow:Nn on line ...
+Defining \fp_gpow:Nn on line ...
+Defining \fp_pow:cn on line ...
+Defining \fp_gpow:cn on line ...
+Defining \fp_exp:Nn on line ...
+Defining \fp_gexp:Nn on line ...
+Defining \fp_exp:cn on line ...
+Defining \fp_gexp:cn on line ...
+Defining \fp_ln:Nn on line ...
+Defining \fp_gln:Nn on line ...
+Defining \fp_ln:cn on line ...
+Defining \fp_gln:cn on line ...
+Defining \fp_sin:Nn on line ...
+Defining \fp_gsin:Nn on line ...
+Defining \fp_sin:cn on line ...
+Defining \fp_gsin:cn on line ...
+Defining \fp_cos:Nn on line ...
+Defining \fp_gcos:Nn on line ...
+Defining \fp_cos:cn on line ...
+Defining \fp_gcos:cn on line ...
+Defining \fp_tan:Nn on line ...
+Defining \fp_gtan:Nn on line ...
+Defining \fp_tan:cn on line ...
+Defining \fp_gtan:cn on line ...
+Defining \fp_assign_to:nNNNn on line ...
+Defining \fp_assign_to_i:wNNNn on line ...
+Defining \fp_assign_to_ii:NnNNN on line ...
+Defining \fp_compare:NNNTF on line ...
+Defining \fp_compare:NNNT on line ...
+Defining \fp_compare:NNNF on line ...
+Defining \fp_compare_p:NNN on line ...
+Defining \fp_round_places:Nn on line ...
+Defining \fp_ground_places:Nn on line ...
+Defining \fp_round_places_aux:NNn on line ...
+Defining \fp_round_places:cn on line ...
+Defining \fp_ground_places:cn on line ...
+Defining \fp_round_figures:Nn on line ...
+Defining \fp_ground_figures:Nn on line ...
+Defining \fp_round_figures:cn on line ...
+Defining \fp_ground_figures:cn on line ...
) (l3box.sty
Defining \box_new:N on line ...
Defining \box_new:c on line ...
Oops, something went wrong. Retry.

0 comments on commit 4d8b141

Please sign in to comment.