pdfcolmk is an empty stub for many years now (bug #12920).

Patch from Udi.
This commit is contained in:
Pavel Sanda 2023-09-28 00:35:07 +02:00
parent bf241165dd
commit 6141b437b1
9 changed files with 189 additions and 83 deletions

View File

@ -372,7 +372,6 @@
\TestPackage{nomencl}
\TestPackage{paralist}
\TestPackage{parskip}
\TestPackage{pdfcolmk}
\TestPackage{pdflscape}
\TestPackage{polyglossia}
\TestPackage{pdfcomment}

View File

@ -146,6 +146,7 @@ logicalmkup
\author 5863208 "ab"
\author 34634807 "Jean-Pierre"
\author 47243155 "Jean-Marc"
\author 193502281 "pc1"
\author 232239728 "Owner"
\author 731793113 "Richard Kimberly Heck" rikiheck@lyx.org
\author 1075283030 "Thibaut"
@ -36014,7 +36015,13 @@ natbib
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765491
rotfloat
\change_inserted 193502281 1695765500
rsphrase
\change_unchanged
\end_layout
\end_inset
@ -36088,7 +36095,13 @@ nomencl
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765498
rsphrase
\change_inserted 193502281 1695765504
setspace
\change_unchanged
\end_layout
\end_inset
@ -36153,7 +36166,13 @@ lyxskak
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765346
pdfcolmk
\change_inserted 193502281 1695765405
pdfpages
\change_unchanged
\end_layout
\end_inset
@ -36162,7 +36181,13 @@ pdfcolmk
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765503
setspace
\change_inserted 193502281 1695765508
shapepar
\change_unchanged
\end_layout
\end_inset
@ -36227,7 +36252,13 @@ makeidx
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765403
pdfpages
\change_inserted 193502281 1695765410
pifont
\change_unchanged
\end_layout
\end_inset
@ -36236,7 +36267,13 @@ pdfpages
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765507
shapepar
\change_inserted 193502281 1695765512
slashed
\change_unchanged
\end_layout
\end_inset
@ -36301,7 +36338,13 @@ marvosym
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765408
pifont
\change_inserted 193502281 1695765466
pmboxdraw
\change_unchanged
\end_layout
\end_inset
@ -36310,7 +36353,13 @@ pifont
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765511
slashed
\change_inserted 193502281 1695765515
soul
\change_unchanged
\end_layout
\end_inset
@ -36375,7 +36424,13 @@ mathdesign
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765464
pmboxdraw
\change_inserted 193502281 1695765470
polyglossia
\change_unchanged
\end_layout
\end_inset
@ -36384,7 +36439,13 @@ pmboxdraw
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765514
soul
\change_inserted 193502281 1695765520
splitidx
\change_unchanged
\end_layout
\end_inset
@ -36449,7 +36510,13 @@ mathdots
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765469
polyglossia
\change_inserted 193502281 1695765474
prettyref
\change_unchanged
\end_layout
\end_inset
@ -36458,7 +36525,13 @@ polyglossia
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765519
splitidx
\change_inserted 193502281 1695765524
subfig
\change_unchanged
\end_layout
\end_inset
@ -36523,7 +36596,13 @@ mathrsfs
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765473
prettyref
\change_inserted 193502281 1695765477
pxfonts
\change_unchanged
\end_layout
\end_inset
@ -36532,7 +36611,13 @@ prettyref
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765523
subfig
\change_inserted 193502281 1695765528
subscript
\change_unchanged
\end_layout
\end_inset
@ -36597,7 +36682,13 @@ mhchem
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765476
pxfonts
\change_inserted 193502281 1695765482
refstyle
\change_unchanged
\end_layout
\end_inset
@ -36606,7 +36697,13 @@ pxfonts
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765527
subscript
\change_inserted 193502281 1695765557
tcolorbox
\change_unchanged
\end_layout
\end_inset
@ -36671,7 +36768,13 @@ multicol
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765481
refstyle
\change_inserted 193502281 1695765485
rotating
\change_unchanged
\end_layout
\end_inset
@ -36745,7 +36848,13 @@ multirow
\begin_inset Text
\begin_layout Plain Layout
\change_deleted 193502281 1695765484
rotating
\change_inserted 193502281 1695765493
rotfloat
\change_unchanged
\end_layout
\end_inset

View File

@ -111,6 +111,7 @@ logicalmkup
\suppress_date false
\justification true
\use_refstyle 0
\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\notefontcolor #0000ff
@ -29175,7 +29176,7 @@ natbib
\begin_inset Text
\begin_layout Plain Layout
rotfloat
rsphrase
\end_layout
\end_inset
@ -29249,7 +29250,7 @@ nomencl
\begin_inset Text
\begin_layout Plain Layout
rsphrase
setspace
\end_layout
\end_inset
@ -29314,7 +29315,7 @@ lyxskak
\begin_inset Text
\begin_layout Plain Layout
pdfcolmk
pdfpages
\end_layout
\end_inset
@ -29323,7 +29324,7 @@ pdfcolmk
\begin_inset Text
\begin_layout Plain Layout
setspace
shapepar
\end_layout
\end_inset
@ -29388,7 +29389,7 @@ makeidx
\begin_inset Text
\begin_layout Plain Layout
pdfpages
pifont
\end_layout
\end_inset
@ -29397,7 +29398,7 @@ pdfpages
\begin_inset Text
\begin_layout Plain Layout
shapepar
slashed
\end_layout
\end_inset
@ -29462,7 +29463,7 @@ marvosym
\begin_inset Text
\begin_layout Plain Layout
pifont
pmboxdraw
\end_layout
\end_inset
@ -29471,7 +29472,7 @@ pifont
\begin_inset Text
\begin_layout Plain Layout
slashed
soul
\end_layout
\end_inset
@ -29536,7 +29537,7 @@ mathdesign
\begin_inset Text
\begin_layout Plain Layout
pmboxdraw
polyglossia
\end_layout
\end_inset
@ -29545,7 +29546,7 @@ pmboxdraw
\begin_inset Text
\begin_layout Plain Layout
soul
splitidx
\end_layout
\end_inset
@ -29610,7 +29611,7 @@ mathdots
\begin_inset Text
\begin_layout Plain Layout
polyglossia
prettyref
\end_layout
\end_inset
@ -29619,7 +29620,7 @@ polyglossia
\begin_inset Text
\begin_layout Plain Layout
splitidx
subfig
\end_layout
\end_inset
@ -29684,7 +29685,7 @@ mathrsfs
\begin_inset Text
\begin_layout Plain Layout
prettyref
pxfonts
\end_layout
\end_inset
@ -29693,7 +29694,7 @@ prettyref
\begin_inset Text
\begin_layout Plain Layout
subfig
subscript
\end_layout
\end_inset
@ -29758,7 +29759,7 @@ mhchem
\begin_inset Text
\begin_layout Plain Layout
pxfonts
refstyle
\end_layout
\end_inset
@ -29767,7 +29768,7 @@ pxfonts
\begin_inset Text
\begin_layout Plain Layout
subscript
tcolorbox
\end_layout
\end_inset
@ -29832,7 +29833,7 @@ multicol
\begin_inset Text
\begin_layout Plain Layout
refstyle
rotating
\end_layout
\end_inset
@ -29906,7 +29907,7 @@ multirow
\begin_inset Text
\begin_layout Plain Layout
rotating
rotfloat
\end_layout
\end_inset

View File

@ -1,5 +1,5 @@
#LyX 2.4 created this file. For more info see https://www.lyx.org/
\lyxformat 614
\lyxformat 618
\begin_document
\begin_header
\save_transient_properties true
@ -102,6 +102,7 @@ logicalmkup
\suppress_date false
\justification true
\use_refstyle 0
\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\notefontcolor #0000ff
@ -28055,7 +28056,7 @@ natbib
\begin_inset Text
\begin_layout Plain Layout
rotfloat
rsphrase
\end_layout
\end_inset
@ -28129,7 +28130,7 @@ nomencl
\begin_inset Text
\begin_layout Plain Layout
rsphrase
setspace
\end_layout
\end_inset
@ -28194,7 +28195,7 @@ lyxskak
\begin_inset Text
\begin_layout Plain Layout
pdfcolmk
pdfpages
\end_layout
\end_inset
@ -28203,7 +28204,7 @@ pdfcolmk
\begin_inset Text
\begin_layout Plain Layout
setspace
shapepar
\end_layout
\end_inset
@ -28268,7 +28269,7 @@ makeidx
\begin_inset Text
\begin_layout Plain Layout
pdfpages
pifont
\end_layout
\end_inset
@ -28277,7 +28278,7 @@ pdfpages
\begin_inset Text
\begin_layout Plain Layout
shapepar
slashed
\end_layout
\end_inset
@ -28342,7 +28343,7 @@ marvosym
\begin_inset Text
\begin_layout Plain Layout
pifont
pmboxdraw
\end_layout
\end_inset
@ -28351,7 +28352,7 @@ pifont
\begin_inset Text
\begin_layout Plain Layout
slashed
soul
\end_layout
\end_inset
@ -28416,7 +28417,7 @@ mathdesign
\begin_inset Text
\begin_layout Plain Layout
pmboxdraw
polyglossia
\end_layout
\end_inset
@ -28425,7 +28426,7 @@ pmboxdraw
\begin_inset Text
\begin_layout Plain Layout
soul
splitidx
\end_layout
\end_inset
@ -28490,7 +28491,7 @@ mathdots
\begin_inset Text
\begin_layout Plain Layout
polyglossia
prettyref
\end_layout
\end_inset
@ -28499,7 +28500,7 @@ polyglossia
\begin_inset Text
\begin_layout Plain Layout
splitidx
subfig
\end_layout
\end_inset
@ -28564,7 +28565,7 @@ mathrsfs
\begin_inset Text
\begin_layout Plain Layout
prettyref
pxfonts
\end_layout
\end_inset
@ -28573,7 +28574,7 @@ prettyref
\begin_inset Text
\begin_layout Plain Layout
subfig
subscript
\end_layout
\end_inset
@ -28638,7 +28639,7 @@ mhchem
\begin_inset Text
\begin_layout Plain Layout
pxfonts
refstyle
\end_layout
\end_inset
@ -28647,7 +28648,7 @@ pxfonts
\begin_inset Text
\begin_layout Plain Layout
subscript
tcolorbox
\end_layout
\end_inset
@ -28712,7 +28713,7 @@ multicol
\begin_inset Text
\begin_layout Plain Layout
refstyle
rotating
\end_layout
\end_inset
@ -28786,7 +28787,7 @@ multirow
\begin_inset Text
\begin_layout Plain Layout
rotating
rotfloat
\end_layout
\end_inset

View File

@ -1,5 +1,5 @@
#LyX 2.4 created this file. For more info see https://www.lyx.org/
\lyxformat 614
\lyxformat 618
\begin_document
\begin_header
\save_transient_properties true
@ -104,6 +104,7 @@ logicalmkup
\suppress_date false
\justification true
\use_refstyle 0
\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\notefontcolor #0000ff
@ -31664,7 +31665,7 @@ natbib
\begin_inset Text
\begin_layout Plain Layout
rotfloat
rsphrase
\end_layout
\end_inset
@ -31738,7 +31739,7 @@ nomencl
\begin_inset Text
\begin_layout Plain Layout
rsphrase
setspace
\end_layout
\end_inset
@ -31803,7 +31804,7 @@ lyxskak
\begin_inset Text
\begin_layout Plain Layout
pdfcolmk
pdfpages
\end_layout
\end_inset
@ -31812,7 +31813,7 @@ pdfcolmk
\begin_inset Text
\begin_layout Plain Layout
setspace
shapepar
\end_layout
\end_inset
@ -31877,7 +31878,7 @@ makeidx
\begin_inset Text
\begin_layout Plain Layout
pdfpages
pifont
\end_layout
\end_inset
@ -31886,7 +31887,7 @@ pdfpages
\begin_inset Text
\begin_layout Plain Layout
shapepar
slashed
\end_layout
\end_inset
@ -31951,7 +31952,7 @@ marvosym
\begin_inset Text
\begin_layout Plain Layout
pifont
pmboxdraw
\end_layout
\end_inset
@ -31960,7 +31961,7 @@ pifont
\begin_inset Text
\begin_layout Plain Layout
slashed
soul
\end_layout
\end_inset
@ -32025,7 +32026,7 @@ mathdesign
\begin_inset Text
\begin_layout Plain Layout
pmboxdraw
polyglossia
\end_layout
\end_inset
@ -32034,7 +32035,7 @@ pmboxdraw
\begin_inset Text
\begin_layout Plain Layout
soul
splitidx
\end_layout
\end_inset
@ -32099,7 +32100,7 @@ mathdots
\begin_inset Text
\begin_layout Plain Layout
polyglossia
prettyref
\end_layout
\end_inset
@ -32108,7 +32109,7 @@ polyglossia
\begin_inset Text
\begin_layout Plain Layout
splitidx
subfig
\end_layout
\end_inset
@ -32173,7 +32174,7 @@ mathrsfs
\begin_inset Text
\begin_layout Plain Layout
prettyref
pxfonts
\end_layout
\end_inset
@ -32182,7 +32183,7 @@ prettyref
\begin_inset Text
\begin_layout Plain Layout
subfig
subscript
\end_layout
\end_inset
@ -32247,7 +32248,7 @@ mhchem
\begin_inset Text
\begin_layout Plain Layout
pxfonts
refstyle
\end_layout
\end_inset
@ -32256,7 +32257,7 @@ pxfonts
\begin_inset Text
\begin_layout Plain Layout
subscript
tcolorbox
\end_layout
\end_inset
@ -32321,7 +32322,7 @@ multicol
\begin_inset Text
\begin_layout Plain Layout
refstyle
rotating
\end_layout
\end_inset
@ -32395,7 +32396,7 @@ multirow
\begin_inset Text
\begin_layout Plain Layout
rotating
rotfloat
\end_layout
\end_inset

View File

@ -1,5 +1,5 @@
#LyX 2.4 created this file. For more info see https://www.lyx.org/
\lyxformat 615
\lyxformat 618
\begin_document
\begin_header
\save_transient_properties false
@ -148,6 +148,7 @@ End
\suppress_date false
\justification false
\use_refstyle 0
\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\notefontcolor #0000ff
@ -29160,7 +29161,7 @@ natbib
\begin_inset Text
\begin_layout Plain Layout
rotfloat
rsphrase
\end_layout
\end_inset
@ -29234,7 +29235,7 @@ nomencl
\begin_inset Text
\begin_layout Plain Layout
rsphrase
setspace
\end_layout
\end_inset
@ -29299,7 +29300,7 @@ lyxskak
\begin_inset Text
\begin_layout Plain Layout
pdfcolmk
pdfpages
\end_layout
\end_inset
@ -29308,7 +29309,7 @@ pdfcolmk
\begin_inset Text
\begin_layout Plain Layout
setspace
shapepar
\end_layout
\end_inset
@ -29373,7 +29374,7 @@ makeidx
\begin_inset Text
\begin_layout Plain Layout
pdfpages
pifont
\end_layout
\end_inset
@ -29382,7 +29383,7 @@ pdfpages
\begin_inset Text
\begin_layout Plain Layout
shapepar
slashed
\end_layout
\end_inset
@ -29447,7 +29448,7 @@ marvosym
\begin_inset Text
\begin_layout Plain Layout
pifont
pmboxdraw
\end_layout
\end_inset
@ -29456,7 +29457,7 @@ pifont
\begin_inset Text
\begin_layout Plain Layout
slashed
soul
\end_layout
\end_inset
@ -29521,7 +29522,7 @@ mathdesign
\begin_inset Text
\begin_layout Plain Layout
pmboxdraw
polyglossia
\end_layout
\end_inset
@ -29530,7 +29531,7 @@ pmboxdraw
\begin_inset Text
\begin_layout Plain Layout
soul
splitidx
\end_layout
\end_inset
@ -29595,7 +29596,7 @@ mathdots
\begin_inset Text
\begin_layout Plain Layout
polyglossia
prettyref
\end_layout
\end_inset
@ -29604,7 +29605,7 @@ polyglossia
\begin_inset Text
\begin_layout Plain Layout
splitidx
subfig
\end_layout
\end_inset
@ -29669,7 +29670,7 @@ mathrsfs
\begin_inset Text
\begin_layout Plain Layout
prettyref
pxfonts
\end_layout
\end_inset
@ -29678,7 +29679,7 @@ prettyref
\begin_inset Text
\begin_layout Plain Layout
subfig
subscript
\end_layout
\end_inset
@ -29743,7 +29744,7 @@ mhchem
\begin_inset Text
\begin_layout Plain Layout
pxfonts
refstyle
\end_layout
\end_inset
@ -29752,7 +29753,7 @@ pxfonts
\begin_inset Text
\begin_layout Plain Layout
subscript
tcolorbox
\end_layout
\end_inset
@ -29817,7 +29818,7 @@ multicol
\begin_inset Text
\begin_layout Plain Layout
refstyle
rotating
\end_layout
\end_inset
@ -29891,7 +29892,7 @@ multirow
\begin_inset Text
\begin_layout Plain Layout
rotating
rotfloat
\end_layout
\end_inset

View File

@ -1619,7 +1619,6 @@ void BufferParams::validate(LaTeXFeatures & features) const
features.require("ulem");
features.require("xcolor");
// improves color handling in PDF output
features.require("pdfcolmk");
} else {
features.require("ct-none");
}

View File

@ -1213,10 +1213,6 @@ string const LaTeXFeatures::getColorOptions() const
<< "]{" << package << "}\n";
}
// pdfcolmk must be loaded after color
if (mustProvide("pdfcolmk"))
colors << "\\usepackage{pdfcolmk}\n";
// the following 3 color commands must be set after color
// is loaded and before pdfpages, therefore add the command
// here define the set color
@ -1396,7 +1392,7 @@ string const LaTeXFeatures::getPackages() const
params_.use_package("undertilde") != BufferParams::package_off)
packages << "\\usepackage{undertilde}\n";
// [x]color and pdfcolmk are handled in getColorOptions() above
// [x]color is handled in getColorOptions() above
// makeidx.sty
if (isRequired("makeidx") || isRequired("splitidx")) {

View File

@ -4352,7 +4352,6 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
if (xcolorulem) {
preamble.registerAutomaticallyLoadedPackage("ulem");
preamble.registerAutomaticallyLoadedPackage("xcolor");
preamble.registerAutomaticallyLoadedPackage("pdfcolmk");
}
} else {
if (xcolorulem) {