diff options
| author | Marius <mariausol@gmail.com> | 2012-05-30 12:40:14 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2012-05-30 12:40:14 +0300 |
| commit | ad5540007a2ac6504a47289ace109a76ec759a7e (patch) | |
| tree | 4a5f42846a6c889f3bd86dbfdb80e46a6820b001 /tex/context/base/grph-trf.mkiv | |
| parent | 250c6bdd3d89cde9d2401172ea0310536eb58db8 (diff) | |
| download | context-ad5540007a2ac6504a47289ace109a76ec759a7e.tar.gz | |
beta 2012.05.30 11:26
Diffstat (limited to 'tex/context/base/grph-trf.mkiv')
| -rw-r--r-- | tex/context/base/grph-trf.mkiv | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/tex/context/base/grph-trf.mkiv b/tex/context/base/grph-trf.mkiv index a33e5606d..5984c8a06 100644 --- a/tex/context/base/grph-trf.mkiv +++ b/tex/context/base/grph-trf.mkiv @@ -38,6 +38,7 @@ \newconditional\c_grph_scale_done \newconditional\c_grph_scale_scaling_done +\newconditional\c_grph_scale_limit_factors \settrue\c_grph_scale_limit_factors \newdimen\d_grph_scale_wd \newdimen\d_grph_scale_ht @@ -232,14 +233,14 @@ % final values \global\d_grph_scale_used_x_size \zeropoint % see note * (core-fig) \global\d_grph_scale_used_y_size \zeropoint % see note * (core-fig) - \c_grph_scale_used_x_scale \plusone % see note * (core-fig) - \c_grph_scale_used_y_scale \plusone % see note * (core-fig) + \c_grph_scale_used_x_scale \plusone % see note * (core-fig) + \c_grph_scale_used_y_scale \plusone % see note * (core-fig) % preparations \setfalse\c_grph_scale_scaling_done \grph_scale_check_parameters % calculators % beware, they operate in sequence, and calculate missing dimensions / messy - %setscaleboxbynature % when? needed? + %grph_scale_by_nature % when? needed? \ifconditional\c_grph_scale_scaling_done\else\grph_scale_by_factor \fi \ifconditional\c_grph_scale_scaling_done\else\grph_scale_by_scale \fi \ifconditional\c_grph_scale_scaling_done\else\grph_scale_by_dimension\fi @@ -321,13 +322,15 @@ \def\grph_scale_by_factor_indeed {\settrue\c_grph_scale_scaling_done - \ifdim\d_grph_scale_used_x_size>\d_grph_scale_h_size - \global\d_grph_scale_used_y_size\zeropoint - \global\d_grph_scale_used_x_size\d_grph_scale_h_size - \else\ifdim\d_grph_scale_used_y_size>\d_grph_scale_v_size - \global\d_grph_scale_used_x_size\zeropoint - \global\d_grph_scale_used_y_size\d_grph_scale_v_size - \fi\fi + \ifconditional\c_grph_scale_limit_factors + \ifdim\d_grph_scale_used_x_size>\d_grph_scale_h_size + \global\d_grph_scale_used_y_size\zeropoint + \global\d_grph_scale_used_x_size\d_grph_scale_h_size + \else\ifdim\d_grph_scale_used_y_size>\d_grph_scale_v_size + \global\d_grph_scale_used_x_size\zeropoint + \global\d_grph_scale_used_y_size\d_grph_scale_v_size + \fi\fi + \fi \grph_scale_by_dimension} \def\grph_scale_by_scale |