Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 50acaa01

Von Marei Peischl vor mehr als 1 Jahr hinzugefügt

  • ID 50acaa01d80712ed596e6dde93b46646b0c9dd06
  • Vorgänger 6b742ae9
  • Nachfolger fd53e3fe

fix line breaking with colored tables

Unterschiede anzeigen:

templates/print/marei/kiviletter.sty
291 291
}
292 292
\long\def\kivi@color@b@x#1#2#3%
293 293
{\leavevmode
294
  \setbox\z@\hbox{{\set@color#3}}%
294
  \setbox\z@\hbox to \linewidth{{\set@color\parbox{\linewidth}{\raggedright#3}}}%
295 295
  \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
296 296
  \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
297 297
  {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}}
298

  
299 298
\long\def\kivi@nocolor@b@x#1#2#3%
300 299
{\leavevmode
301
  \setbox\z@\hbox{#3}%
300
  \setbox\z@\hbox to \linewidth{\parbox{\linewidth}{\raggedright#3}}%
302 301
  \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
303 302
  \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
304 303
  {\box\z@}}
305

  
306 304
%%%
307

  
308 305
\newcommand{\FakeTable}[1]{
309 306
  \par
310 307
  \seq_set_split:Nnn \l_kivi_PricingTable_seq {\tabularnewline} {#1}
......
321 318
      {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
322 319
      {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
323 320
    }
324
    {\parbox{\linewidth}{
321
    {
322
     \parbox{\linewidth}{
325 323
        \seq_set_split:Nnn  \l_kivi_columns_seq {&} {##1}
326 324
        \seq_gclear:N \g_kivi_extraDescription_seq
327 325
        \exp_args:Nnx \use:n {\tabular[t]}\g_kivi_Pricing_colspec_tl
......
331 329
          &\seq_item:Nn \l_kivi_columns_seq {####1}
332 330
        }
333 331
        \endtabular
332
       }
334 333
      }
334

  
335 335
        \seq_if_empty:NTF \g_kivi_extraDescription_seq
336 336
        {\par}
337 337
        {\par\nopagebreak
338
          \begingroup
338
            \bool_if:NT \g__kivi_Tabular_rowcolor_bool {
339
              \int_if_odd:nTF {\g__kivi_PricingTable_rowcolor_int}
340
              {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
341
              {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
342
            }
343
          {
339 344
          \setlength{\leftskip}{\dim_eval:n {\bool_if:NT \g__kivi_Tabular_rowcolor_bool {-\tabcolsep} +\l_kivi_tab_desc_leftskip_dim}}
340 345
          \setlength{\hsize}{\dim_eval:n {\l_kivi_tab_desc_dim+\leftskip}}
341 346
          \setlength{\linewidth}{\hsize}
......
343 348
          \usekomafont{extraDescription}
344 349
          \seq_use:Nn \g_kivi_extraDescription_seq {\ifhmode\\\fi}
345 350
          \par
346
          \endgroup
351
          }
347 352
        }
348
    }
349 353
    \par
350 354
    \tl_if_empty:NF \l__kivi_Tabular_rowsep_tl {\nointerlineskip\l__kivi_Tabular_rowsep_tl}
351 355
  }
352 356
  \endgroup
353 357
  \par
354 358
}
355

  
356

  
357 359
\seq_new:N  \__l_FakeTable_columns_seq
358 360
\cs_new:Nn \__kivi_setup_FakeTable: {
359 361
  \seq_clear:N \__l_FakeTable_columns_seq
......
552 554
  \__kivi_setup_LT_boxes:
553 555
  \__kivi_setup_FakeTable:
554 556
  \dim_set:Nn \parskip {\c_zero_dim}
557
  \dim_set:Nn \parindent {\c_zero_dim}
555 558
  \PricingTabularBox\ignorespaces
556 559
}{\endPricingTabularBox
557 560
  %compensate footer spacing

Auch abrufbar als: Unified diff