Attachment #4306 for bug #23157

View | Details | Raw Unified | Return to bug 23157
Collapse All | Expand All

Lines 8335-8340 Link Here

(-)gutenprint-5.2.5.orig/po/cs.po (+3 lines)
8335	msgid "Canon PIXMA MP770"	8335	msgid "Canon PIXMA MP770"
8336	msgstr ""	8336	msgstr ""
8337		8337
		8338	msgid "Canon PIXMA MP970"
		8339	msgstr ""
		8340
8338	#: src/xml/xmli18n-tmp.h:6338	8341	#: src/xml/xmli18n-tmp.h:6338
8339	msgid "Canon PIXMA MP780"	8342	msgid "Canon PIXMA MP780"
8340	msgstr ""	8343	msgstr ""

Lines 8057-8062 Link Here

(-)gutenprint-5.2.5.orig/po/da.po (+3 lines)
8057	msgid "Canon PIXMA MP770"	8057	msgid "Canon PIXMA MP770"
8058	msgstr "Canon PIXMA MP770"	8058	msgstr "Canon PIXMA MP770"
8059		8059
		8060	msgid "Canon PIXMA MP970"
		8061	msgstr "Canon PIXMA MP970"
		8062
8060	#: src/xml/xmli18n-tmp.h:6338	8063	#: src/xml/xmli18n-tmp.h:6338
8061	msgid "Canon PIXMA MP780"	8064	msgid "Canon PIXMA MP780"
8062	msgstr "Canon PIXMA MP780"	8065	msgstr "Canon PIXMA MP780"

Lines 8219-8224 Link Here

(-)gutenprint-5.2.5.orig/po/de.po (+3 lines)
8219	msgid "Canon PIXMA MP770"	8219	msgid "Canon PIXMA MP770"
8220	msgstr "Canon PIXMA MP770"	8220	msgstr "Canon PIXMA MP770"
8221		8221
		8222	msgid "Canon PIXMA MP970"
		8223	msgstr "Canon PIXMA MP970"
		8224
8222	#: src/xml/xmli18n-tmp.h:6338	8225	#: src/xml/xmli18n-tmp.h:6338
8223	msgid "Canon PIXMA MP780"	8226	msgid "Canon PIXMA MP780"
8224	msgstr "Canon PIXMA MP780"	8227	msgstr "Canon PIXMA MP780"

Lines 8249-8254 Link Here

(-)gutenprint-5.2.5.orig/po/el.po (+3 lines)
8249	msgid "Canon PIXMA MP770"	8249	msgid "Canon PIXMA MP770"
8250	msgstr ""	8250	msgstr ""
8251		8251
		8252	msgid "Canon PIXMA MP970"
		8253	msgstr ""
		8254
8252	#: src/xml/xmli18n-tmp.h:6338	8255	#: src/xml/xmli18n-tmp.h:6338
8253	msgid "Canon PIXMA MP780"	8256	msgid "Canon PIXMA MP780"
8254	msgstr ""	8257	msgstr ""

Lines 8069-8074 Link Here

(-)gutenprint-5.2.5.orig/po/en_GB.po (+3 lines)
8069	msgid "Canon PIXMA MP770"	8069	msgid "Canon PIXMA MP770"
8070	msgstr "Canon PIXMA MP770"	8070	msgstr "Canon PIXMA MP770"
8071		8071
		8072	msgid "Canon PIXMA MP970"
		8073	msgstr "Canon PIXMA MP970"
		8074
8072	#: src/xml/xmli18n-tmp.h:6338	8075	#: src/xml/xmli18n-tmp.h:6338
8073	msgid "Canon PIXMA MP780"	8076	msgid "Canon PIXMA MP780"
8074	msgstr "Canon PIXMA MP780"	8077	msgstr "Canon PIXMA MP780"

Lines 8412-8417 Link Here

(-)gutenprint-5.2.5.orig/po/es.po (+3 lines)
8412	msgid "Canon PIXMA MP770"	8412	msgid "Canon PIXMA MP770"
8413	msgstr ""	8413	msgstr ""
8414		8414
		8415	msgid "Canon PIXMA MP970"
		8416	msgstr ""
		8417
8415	#: src/xml/xmli18n-tmp.h:6338	8418	#: src/xml/xmli18n-tmp.h:6338
8416	msgid "Canon PIXMA MP780"	8419	msgid "Canon PIXMA MP780"
8417	msgstr ""	8420	msgstr ""

Lines 8246-8251 Link Here

(-)gutenprint-5.2.5.orig/po/fr.po (+3 lines)
8246	msgid "Canon PIXMA MP770"	8246	msgid "Canon PIXMA MP770"
8247	msgstr "Canon iP4000"	8247	msgstr "Canon iP4000"
8248		8248
		8249	msgid "Canon PIXMA MP970"
		8250	msgstr ""
		8251
8249	#: src/xml/xmli18n-tmp.h:6338	8252	#: src/xml/xmli18n-tmp.h:6338
8250	#, fuzzy	8253	#, fuzzy
8251	msgid "Canon PIXMA MP780"	8254	msgid "Canon PIXMA MP780"

Lines 7792-7797 Link Here

(-)gutenprint-5.2.5.orig/po/gutenprint.pot (+3 lines)
7792	msgid "Canon PIXMA MP830"	7792	msgid "Canon PIXMA MP830"
7793	msgstr ""	7793	msgstr ""
7794		7794
		7795	msgid "Canon PIXMA MP970"
		7796	msgstr ""
		7797
7795	#: src/xml/xmli18n-tmp.h:6341	7798	#: src/xml/xmli18n-tmp.h:6341
7796	msgid "Canon PIXUS iP3100"	7799	msgid "Canon PIXUS iP3100"
7797	msgstr ""	7800	msgstr ""

Lines 7951-7956 Link Here

(-)gutenprint-5.2.5.orig/po/hu.po (+3 lines)
7951	msgid "Canon PIXMA MP770"	7951	msgid "Canon PIXMA MP770"
7952	msgstr "Canon PIXMA MP770"	7952	msgstr "Canon PIXMA MP770"
7953		7953
		7954	msgid "Canon PIXMA MP970"
		7955	msgstr "Canon PIXMA MP970"
		7956
7954	#: src/xml/xmli18n-tmp.h:6338	7957	#: src/xml/xmli18n-tmp.h:6338
7955	msgid "Canon PIXMA MP780"	7958	msgid "Canon PIXMA MP780"
7956	msgstr "Canon PIXMA MP780"	7959	msgstr "Canon PIXMA MP780"

Lines 8144-8149 Link Here

(-)gutenprint-5.2.5.orig/po/it.po (+3 lines)
8144	msgid "Canon PIXMA MP770"	8144	msgid "Canon PIXMA MP770"
8145	msgstr "Canon PIXMA MP770"	8145	msgstr "Canon PIXMA MP770"
8146		8146
		8147	msgid "Canon PIXMA MP970"
		8148	msgstr "Canon PIXMA MP970"
		8149
8147	#: src/xml/xmli18n-tmp.h:6338	8150	#: src/xml/xmli18n-tmp.h:6338
8148	msgid "Canon PIXMA MP780"	8151	msgid "Canon PIXMA MP780"
8149	msgstr "Canon PIXMA MP780"	8152	msgstr "Canon PIXMA MP780"

Lines 8350-8355 Link Here

(-)gutenprint-5.2.5.orig/po/ja.po (+3 lines)
8350	msgid "Canon PIXMA MP770"	8350	msgid "Canon PIXMA MP770"
8351	msgstr ""	8351	msgstr ""
8352		8352
		8353	msgid "Canon PIXMA MP970"
		8354	msgstr ""
		8355
8353	#: src/xml/xmli18n-tmp.h:6338	8356	#: src/xml/xmli18n-tmp.h:6338
8354	msgid "Canon PIXMA MP780"	8357	msgid "Canon PIXMA MP780"
8355	msgstr ""	8358	msgstr ""

Lines 8108-8113 Link Here

(-)gutenprint-5.2.5.orig/po/nb.po (+3 lines)
8108	msgid "Canon PIXMA MP770"	8108	msgid "Canon PIXMA MP770"
8109	msgstr "Stylus C60"	8109	msgstr "Stylus C60"
8110		8110
		8111	msgid "Canon PIXMA MP970"
		8112	msgstr ""
		8113
8111	#: src/xml/xmli18n-tmp.h:6338	8114	#: src/xml/xmli18n-tmp.h:6338
8112	#, fuzzy	8115	#, fuzzy
8113	msgid "Canon PIXMA MP780"	8116	msgid "Canon PIXMA MP780"

Lines 8076-8081 Link Here

(-)gutenprint-5.2.5.orig/po/nl.po (+3 lines)
8076	msgid "Canon PIXMA MP770"	8076	msgid "Canon PIXMA MP770"
8077	msgstr "Canon PIXMA MP770"	8077	msgstr "Canon PIXMA MP770"
8078		8078
		8079	msgid "Canon PIXMA MP970"
		8080	msgstr "Canon PIXMA MP970"
		8081
8079	#: src/xml/xmli18n-tmp.h:6338	8082	#: src/xml/xmli18n-tmp.h:6338
8080	msgid "Canon PIXMA MP780"	8083	msgid "Canon PIXMA MP780"
8081	msgstr "Canon PIXMA MP780"	8084	msgstr "Canon PIXMA MP780"

Lines 8011-8016 Link Here

(-)gutenprint-5.2.5.orig/po/pl.po (+3 lines)
8011	msgid "Canon PIXMA MP770"	8011	msgid "Canon PIXMA MP770"
8012	msgstr ""	8012	msgstr ""
8013		8013
		8014	msgid "Canon PIXMA MP970"
		8015	msgstr ""
		8016
8014	#: src/xml/xmli18n-tmp.h:6338	8017	#: src/xml/xmli18n-tmp.h:6338
8015	msgid "Canon PIXMA MP780"	8018	msgid "Canon PIXMA MP780"
8016	msgstr ""	8019	msgstr ""

Lines 8383-8388 Link Here

(-)gutenprint-5.2.5.orig/po/pt.po (+3 lines)
8383	msgid "Canon PIXMA MP770"	8383	msgid "Canon PIXMA MP770"
8384	msgstr ""	8384	msgstr ""
8385		8385
		8386	msgid "Canon PIXMA MP970"
		8387	msgstr ""
		8388
8386	#: src/xml/xmli18n-tmp.h:6338	8389	#: src/xml/xmli18n-tmp.h:6338
8387	msgid "Canon PIXMA MP780"	8390	msgid "Canon PIXMA MP780"
8388	msgstr ""	8391	msgstr ""

Lines 7826-7831 Link Here

(-)gutenprint-5.2.5.orig/po/ru.po (+3 lines)
7826	msgid "Canon PIXMA MP770"	7826	msgid "Canon PIXMA MP770"
7827	msgstr "Canon PIXMA MP770"	7827	msgstr "Canon PIXMA MP770"
7828		7828
		7829	msgid "Canon PIXMA MP970"
		7830	msgstr "Canon PIXMA MP970"
		7831
7829	#: src/xml/xmli18n-tmp.h:6338	7832	#: src/xml/xmli18n-tmp.h:6338
7830	msgid "Canon PIXMA MP780"	7833	msgid "Canon PIXMA MP780"
7831	msgstr "Canon PIXMA MP780"	7834	msgstr "Canon PIXMA MP780"

Lines 8374-8379 Link Here

(-)gutenprint-5.2.5.orig/po/sk.po (+3 lines)
8374	msgid "Canon PIXMA MP770"	8374	msgid "Canon PIXMA MP770"
8375	msgstr ""	8375	msgstr ""
8376		8376
		8377	msgid "Canon PIXMA MP970"
		8378	msgstr ""
		8379
8377	#: src/xml/xmli18n-tmp.h:6338	8380	#: src/xml/xmli18n-tmp.h:6338
8378	msgid "Canon PIXMA MP780"	8381	msgid "Canon PIXMA MP780"
8379	msgstr ""	8382	msgstr ""

Lines 8288-8293 Link Here

(-)gutenprint-5.2.5.orig/po/sv.po (+3 lines)
8288	msgid "Canon PIXMA MP770"	8288	msgid "Canon PIXMA MP770"
8289	msgstr "Epson PM 770C"	8289	msgstr "Epson PM 770C"
8290		8290
		8291	msgid "Canon PIXMA MP970"
		8292	msgstr ""
		8293
8291	#: src/xml/xmli18n-tmp.h:6338	8294	#: src/xml/xmli18n-tmp.h:6338
8292	#, fuzzy	8295	#, fuzzy
8293	msgid "Canon PIXMA MP780"	8296	msgid "Canon PIXMA MP780"

Lines 7995-8000 Link Here

(-)gutenprint-5.2.5.orig/po/zh_TW.po (+3 lines)
7995	msgid "Canon PIXMA MP770"	7995	msgid "Canon PIXMA MP770"
7996	msgstr ""	7996	msgstr ""
7997		7997
		7998	msgid "Canon PIXMA MP970"
		7999	msgstr ""
		8000
7998	#: src/xml/xmli18n-tmp.h:6338	8001	#: src/xml/xmli18n-tmp.h:6338
7999	#, fuzzy	8002	#, fuzzy
8000	msgid "Canon PIXMA MP780"	8003	msgid "Canon PIXMA MP780"

Lines 132-137 Link Here

(-)gutenprint-5.2.5.orig/src/foomatic/foomatic-printermap (+1 lines)
132	#gptofoo bjc-MULTIPASS-MP780 printer/Canon-MULTIPASS-MP780	132	#gptofoo bjc-MULTIPASS-MP780 printer/Canon-MULTIPASS-MP780
133	#gptofoo bjc-MULTIPASS-MP790 printer/Canon-MULTIPASS-MP790	133	#gptofoo bjc-MULTIPASS-MP790 printer/Canon-MULTIPASS-MP790
134	#gptofoo bjc-MULTIPASS-MP830 printer/Canon-MULTIPASS-MP830	134	#gptofoo bjc-MULTIPASS-MP830 printer/Canon-MULTIPASS-MP830
		135	#gptofoo bjc-MULTIPASS-MP970 printer/Canon-MULTIPASS-MP970
135	#gptofoo bjc-PIXUS-iP3100 printer/Canon-PIXUS-iP3100	136	#gptofoo bjc-PIXUS-iP3100 printer/Canon-PIXUS-iP3100
136	#gptofoo bjc-PIXUS-iP4100 printer/Canon-PIXUS-iP4100	137	#gptofoo bjc-PIXUS-iP4100 printer/Canon-PIXUS-iP4100
137	#gptofoo bjc-i80 printer/Canon-i80	138	#gptofoo bjc-i80 printer/Canon-i80




        {'m',1.0,&canon_3b_7l_ink}
};

static const canon_inkset_t canon_7_c4m4k4C4M4Y4K4_inkset[] = {
        {'c',0.5,&canon_2b_4l_ink},
        {'m',0.5,&canon_2b_4l_ink},
        {'k',0.5,&canon_2b_4l_ink},
        {'C',1.0,&canon_2b_4l_ink},
        {'M',1.0,&canon_2b_4l_ink},
        {'Y',1.0,&canon_2b_4l_ink},
        {'K',1.0,&canon_2b_4l_ink},
};

static const canon_inkset_t canon_7_C4M4Y4c4m4k4K4_inkset[] = {
        {'C',1.0,&canon_2b_4l_ink},
        {'M',1.0,&canon_2b_4l_ink},
        {'Y',1.0,&canon_2b_4l_ink},
        {'c',1.0,&canon_2b_4l_ink},
        {'m',1.0,&canon_2b_4l_ink},
        {'k',1.0,&canon_2b_4l_ink},
        {'K',1.0,&canon_2b_4l_ink},
};

static const canon_inkset_t canon_7_c4m4C4M4Y4k4K4_inkset[] = {
        {'c',0.5,&canon_2b_4l_ink},
        {'m',0.5,&canon_2b_4l_ink},
        {'C',1.0,&canon_2b_4l_ink},
        {'M',1.0,&canon_2b_4l_ink},
        {'Y',1.0,&canon_2b_4l_ink},
        {'k',0.5,&canon_2b_4l_ink},
        {'K',1.0,&canon_2b_4l_ink},
};

static const canon_inkset_t canon_19_C4M4Y4K4c4m4k4_inkset[] = {
        {'C',1.0,&canon_2b_4l_ink},
        {'M',1.0,&canon_2b_4l_ink},
        {'Y',1.0,&canon_2b_4l_ink},
        {'K',1.0,&canon_2b_4l_ink},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {'c',0.5,&canon_2b_4l_ink},
        {'m',0.5,&canon_2b_4l_ink},
        {'k',0.5,&canon_2b_4l_ink},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
        {0,0.0,NULL},
};

static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
        {'C',1.0,&canon_2b_3l_ink},
        {'M',1.0,&canon_2b_3l_ink},

        {0,0.0,NULL}
};

static const canon_inkset_t canon_9_C3M3Y3K2c3m3k3_c2_inkset[] = {
        {'C',1.0,&canon_2b_3l_c_ink},
        {'M',1.0,&canon_2b_3l_c_ink},
        {'Y',1.0,&canon_2b_3l_c_ink},
        {'K',1.0,&canon_1b_2l_ink},
        {'c',0.5,&canon_2b_3l_c_ink},
        {'m',0.5,&canon_2b_3l_c_ink},
        {0,0.0,NULL},
        {'k',1.0,&canon_2b_3l_c_ink},
        {0,0.0,NULL}
};

static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_2_inkset[] = {
        {'C',1.0,&canon_2b_4l_ink},
        {'M',1.0,&canon_2b_4l_ink},
        {'Y',1.0,&canon_2b_4l_ink},
        {'K',1.0,&canon_1b_2l_ink},
        {'c',1.0,&canon_2b_4l_ink},
        {'m',1.0,&canon_2b_4l_ink},
        {0,0.0,NULL},
        {'k',1.0,&canon_2b_4l_ink},
        {0,0.0,NULL}
};

static const canon_inkset_t canon_9_C4M4Y4K4c16m16k16_inkset[] = {
        {'C',1.0,&canon_2b_4l_ink},
        {'M',1.0,&canon_2b_4l_ink},
        {'Y',1.0,&canon_2b_4l_ink},
        {'K',1.0,&canon_2b_4l_ink},
        {'c',0.33,&canon_4b_16l_ink},
        {'m',0.33,&canon_4b_16l_ink},
        {0,0.0,NULL},
        {'k',0.33,&canon_4b_16l_ink},
        {0,0.0,NULL}
};

/* iP4000 mode used for T-Shirt (quality 2) */
static const canon_inkset_t canon_9_C4M4Y4K2k4_inkset[] = {
        {'C',1.0,&canon_2b_4l_ink},

	{0,0.0,NULL},
};

static const canon_inkset_t canon_13_C3M3Y4K2c3m3k3_c_inkset[] = {
	{'C',1.0,&canon_2b_3l_c_ink},
	{'M',1.0,&canon_2b_3l_c_ink},
	{'Y',1.0,&canon_2b_3l_c_ink},
	{'K',1.0,&canon_1b_2l_ink},
	{'c',1.0,&canon_2b_3l_c_ink},
	{'m',1.0,&canon_2b_3l_c_ink},
	{0,0.0,NULL},
	{'k',1.0,&canon_2b_3l_c_ink},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
};

static const canon_inkset_t canon_13_C4M4Y4K2c4m4k4_inkset[] = {
	{'C',1.0,&canon_2b_4l_ink},
	{'M',1.0,&canon_2b_4l_ink},
	{'Y',1.0,&canon_2b_4l_ink},
	{'K',1.0,&canon_1b_2l_ink},
	{'c',1.0,&canon_2b_4l_ink},
	{'m',1.0,&canon_2b_4l_ink},
	{0,0.0,NULL},
	{'k',1.0,&canon_2b_4l_ink},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
};

static const canon_inkset_t canon_13_C4M4Y4K2c16m16k16_inkset[] = {
	{'C',1.0,&canon_2b_4l_ink},
	{'M',1.0,&canon_2b_4l_ink},
	{'Y',1.0,&canon_2b_4l_ink},
	{'K',1.0,&canon_1b_2l_ink},
	{'c',1.0,&canon_4b_16l_ink},
	{'m',1.0,&canon_4b_16l_ink},
	{0,0.0,NULL},
	{'k',1.0,&canon_4b_16l_ink},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
	{0,0.0,NULL},
};


static const canon_inkset_t canon_13_C6M6Y4k4yask_inkset[] = {
	{'C',1.0,&canon_4b_6l_ink},
	{'M',1.0,&canon_4b_6l_ink},





/* delay settings for the different printmodes  last entry has to be {0,0} */
static const canon_delay_t delay_1440[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{'y',336},{0,0}};
static const canon_delay_t delay_1200[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{0,0}};
static const canon_delay_t delay_S200[] = {{'C',0x30},{'M',0x50},{'Y',0x70},{0,0}};



};
DECLARE_MODES(canon_MULTIPASS_MP830,0);

static const canon_mode_t canon_MULTIPASS_MP970_modes[] = {
#if 0
  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI MP610"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI MP770"),INKSET(9_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y3K2c3m3k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y4K2c3m3k4_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
#endif
  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(7_C4M4Y4c4m4k4K4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(7_C4M4Y4c4m4k4K4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
#if 0
  { 1200,1200,CANON_INK_CcMmYK|CANON_INK_K,"1200x1200dpi_high",N_("1200x1200 DPI HIGH"),INKSET(7_k4c4m4K4M4C4Y4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,2.0,2.0,NULL,NULL,NULL,0},
#endif
};
DECLARE_MODES(canon_MULTIPASS_MP970,1);

static const canon_mode_t canon_PIXMA_iX5000_modes[] = {
  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
};




    NULL,
    NULL
  },
  { /* Canon PIXMA MP970 */
    "PIXMA MP970", 3,          /*model, model_id*/
    842, 17*72,       /* max paper width and height */
    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
    8,
    &canon_PIXMA_iP4000_slotlist,
    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150,  /*features */
#if 0
    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000,  /*features */
    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150,  /*features */
#endif
    &canon_MULTIPASS_MP970_modelist,
    &canon_PIXMA_iP4000_paperlist,
    NULL,
    NULL,
    NULL,
    NULL
  },
  /* ******************************** */
  /*                                  */
  /* tested and color-adjusted models */

Lines 162-167 Link Here

(-)gutenprint-5.2.5.orig/src/xml/printers.xml (+1 lines)
162	<printer translate="name" name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />	162	<printer translate="name" name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
163	<printer translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />	163	<printer translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
164	<printer translate="name" name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />	164	<printer translate="name" name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />
		165	<printer translate="name" name="Canon PIXMA MP970" driver="bjc-MULTIPASS-MP970" manufacturer="Canon" model="5000970" parameters="PIXMA_iP4000_params" />
165	<printer translate="name" name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />	166	<printer translate="name" name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
166	<printer translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />	167	<printer translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
167	<printer translate="name" name="Canon i80" driver="bjc-i80" manufacturer="Canon" model="2000080" parameters="density_800_params" />	168	<printer translate="name" name="Canon i80" driver="bjc-i80" manufacturer="Canon" model="2000080" parameters="density_800_params" />

Return to bug 23157

Lines 278-283 Link Here

(-)gutenprint-5.2.5.orig/src/main/canon-inks.h (+137 lines)
278	{'m',1.0,&canon_3b_7l_ink}	278	{'m',1.0,&canon_3b_7l_ink}
279	};	279	};
280		280
		281	static const canon_inkset_t canon_7_c4m4k4C4M4Y4K4_inkset[] = {
		282	{'c',0.5,&canon_2b_4l_ink},
		283	{'m',0.5,&canon_2b_4l_ink},
		284	{'k',0.5,&canon_2b_4l_ink},
		285	{'C',1.0,&canon_2b_4l_ink},
		286	{'M',1.0,&canon_2b_4l_ink},
		287	{'Y',1.0,&canon_2b_4l_ink},
		288	{'K',1.0,&canon_2b_4l_ink},
		289	};
		290
		291	static const canon_inkset_t canon_7_C4M4Y4c4m4k4K4_inkset[] = {
		292	{'C',1.0,&canon_2b_4l_ink},
		293	{'M',1.0,&canon_2b_4l_ink},
		294	{'Y',1.0,&canon_2b_4l_ink},
		295	{'c',1.0,&canon_2b_4l_ink},
		296	{'m',1.0,&canon_2b_4l_ink},
		297	{'k',1.0,&canon_2b_4l_ink},
		298	{'K',1.0,&canon_2b_4l_ink},
		299	};
		300
		301	static const canon_inkset_t canon_7_c4m4C4M4Y4k4K4_inkset[] = {
		302	{'c',0.5,&canon_2b_4l_ink},
		303	{'m',0.5,&canon_2b_4l_ink},
		304	{'C',1.0,&canon_2b_4l_ink},
		305	{'M',1.0,&canon_2b_4l_ink},
		306	{'Y',1.0,&canon_2b_4l_ink},
		307	{'k',0.5,&canon_2b_4l_ink},
		308	{'K',1.0,&canon_2b_4l_ink},
		309	};
		310
		311	static const canon_inkset_t canon_19_C4M4Y4K4c4m4k4_inkset[] = {
		312	{'C',1.0,&canon_2b_4l_ink},
		313	{'M',1.0,&canon_2b_4l_ink},
		314	{'Y',1.0,&canon_2b_4l_ink},
		315	{'K',1.0,&canon_2b_4l_ink},
		316	{0,0.0,NULL},
		317	{0,0.0,NULL},
		318	{0,0.0,NULL},
		319	{0,0.0,NULL},
		320	{0,0.0,NULL},
		321	{'c',0.5,&canon_2b_4l_ink},
		322	{'m',0.5,&canon_2b_4l_ink},
		323	{'k',0.5,&canon_2b_4l_ink},
		324	{0,0.0,NULL},
		325	{0,0.0,NULL},
		326	{0,0.0,NULL},
		327	{0,0.0,NULL},
		328	{0,0.0,NULL},
		329	{0,0.0,NULL},
		330	{0,0.0,NULL},
		331	};
		332
281	static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {	333	static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
282	{'C',1.0,&canon_2b_3l_ink},	334	{'C',1.0,&canon_2b_3l_ink},
283	{'M',1.0,&canon_2b_3l_ink},	335	{'M',1.0,&canon_2b_3l_ink},
Lines 353-358 Link Here
353	{0,0.0,NULL}	405	{0,0.0,NULL}
354	};	406	};
355		407
		408	static const canon_inkset_t canon_9_C3M3Y3K2c3m3k3_c2_inkset[] = {
		409	{'C',1.0,&canon_2b_3l_c_ink},
		410	{'M',1.0,&canon_2b_3l_c_ink},
		411	{'Y',1.0,&canon_2b_3l_c_ink},
		412	{'K',1.0,&canon_1b_2l_ink},
		413	{'c',0.5,&canon_2b_3l_c_ink},
		414	{'m',0.5,&canon_2b_3l_c_ink},
		415	{0,0.0,NULL},
		416	{'k',1.0,&canon_2b_3l_c_ink},
		417	{0,0.0,NULL}
		418	};
		419
		420	static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_2_inkset[] = {
		421	{'C',1.0,&canon_2b_4l_ink},
		422	{'M',1.0,&canon_2b_4l_ink},
		423	{'Y',1.0,&canon_2b_4l_ink},
		424	{'K',1.0,&canon_1b_2l_ink},
		425	{'c',1.0,&canon_2b_4l_ink},
		426	{'m',1.0,&canon_2b_4l_ink},
		427	{0,0.0,NULL},
		428	{'k',1.0,&canon_2b_4l_ink},
		429	{0,0.0,NULL}
		430	};
		431
		432	static const canon_inkset_t canon_9_C4M4Y4K4c16m16k16_inkset[] = {
		433	{'C',1.0,&canon_2b_4l_ink},
		434	{'M',1.0,&canon_2b_4l_ink},
		435	{'Y',1.0,&canon_2b_4l_ink},
		436	{'K',1.0,&canon_2b_4l_ink},
		437	{'c',0.33,&canon_4b_16l_ink},
		438	{'m',0.33,&canon_4b_16l_ink},
		439	{0,0.0,NULL},
		440	{'k',0.33,&canon_4b_16l_ink},
		441	{0,0.0,NULL}
		442	};
		443
356	/* iP4000 mode used for T-Shirt (quality 2) */	444	/* iP4000 mode used for T-Shirt (quality 2) */
357	static const canon_inkset_t canon_9_C4M4Y4K2k4_inkset[] = {	445	static const canon_inkset_t canon_9_C4M4Y4K2k4_inkset[] = {
358	{'C',1.0,&canon_2b_4l_ink},	446	{'C',1.0,&canon_2b_4l_ink},
Lines 488-493 Link Here
488	{0,0.0,NULL},	576	{0,0.0,NULL},
489	};	577	};
490		578
		579	static const canon_inkset_t canon_13_C3M3Y4K2c3m3k3_c_inkset[] = {
		580	{'C',1.0,&canon_2b_3l_c_ink},
		581	{'M',1.0,&canon_2b_3l_c_ink},
		582	{'Y',1.0,&canon_2b_3l_c_ink},
		583	{'K',1.0,&canon_1b_2l_ink},
		584	{'c',1.0,&canon_2b_3l_c_ink},
		585	{'m',1.0,&canon_2b_3l_c_ink},
		586	{0,0.0,NULL},
		587	{'k',1.0,&canon_2b_3l_c_ink},
		588	{0,0.0,NULL},
		589	{0,0.0,NULL},
		590	{0,0.0,NULL},
		591	{0,0.0,NULL},
		592	{0,0.0,NULL},
		593	};
		594
		595	static const canon_inkset_t canon_13_C4M4Y4K2c4m4k4_inkset[] = {
		596	{'C',1.0,&canon_2b_4l_ink},
		597	{'M',1.0,&canon_2b_4l_ink},
		598	{'Y',1.0,&canon_2b_4l_ink},
		599	{'K',1.0,&canon_1b_2l_ink},
		600	{'c',1.0,&canon_2b_4l_ink},
		601	{'m',1.0,&canon_2b_4l_ink},
		602	{0,0.0,NULL},
		603	{'k',1.0,&canon_2b_4l_ink},
		604	{0,0.0,NULL},
		605	{0,0.0,NULL},
		606	{0,0.0,NULL},
		607	{0,0.0,NULL},
		608	{0,0.0,NULL},
		609	};
		610
		611	static const canon_inkset_t canon_13_C4M4Y4K2c16m16k16_inkset[] = {
		612	{'C',1.0,&canon_2b_4l_ink},
		613	{'M',1.0,&canon_2b_4l_ink},
		614	{'Y',1.0,&canon_2b_4l_ink},
		615	{'K',1.0,&canon_1b_2l_ink},
		616	{'c',1.0,&canon_4b_16l_ink},
		617	{'m',1.0,&canon_4b_16l_ink},
		618	{0,0.0,NULL},
		619	{'k',1.0,&canon_4b_16l_ink},
		620	{0,0.0,NULL},
		621	{0,0.0,NULL},
		622	{0,0.0,NULL},
		623	{0,0.0,NULL},
		624	{0,0.0,NULL},
		625	};
		626
		627
491	static const canon_inkset_t canon_13_C6M6Y4k4yask_inkset[] = {	628	static const canon_inkset_t canon_13_C6M6Y4k4yask_inkset[] = {
492	{'C',1.0,&canon_4b_6l_ink},	629	{'C',1.0,&canon_4b_6l_ink},
493	{'M',1.0,&canon_4b_6l_ink},	630	{'M',1.0,&canon_4b_6l_ink},

Lines 80-85 Link Here

(-)gutenprint-5.2.5.orig/src/main/canon-modes.h (+16 lines)
80		80
81	/* delay settings for the different printmodes last entry has to be {0,0} */	81	/* delay settings for the different printmodes last entry has to be {0,0} */
82	static const canon_delay_t delay_1440[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{'y',336},{0,0}};	82	static const canon_delay_t delay_1440[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{'y',336},{0,0}};
		83	static const canon_delay_t delay_1200[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{0,0}};
83	static const canon_delay_t delay_S200[] = {{'C',0x30},{'M',0x50},{'Y',0x70},{0,0}};	84	static const canon_delay_t delay_S200[] = {{'C',0x30},{'M',0x50},{'Y',0x70},{0,0}};
84		85
85		86
Lines 347-352 Link Here
347	};	348	};
348	DECLARE_MODES(canon_MULTIPASS_MP830,0);	349	DECLARE_MODES(canon_MULTIPASS_MP830,0);
349		350
		351	static const canon_mode_t canon_MULTIPASS_MP970_modes[] = {
		352	#if 0
		353	{ 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI MP610"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
		354	{ 600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI MP770"),INKSET(9_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
		355	{ 600, 600,CANON_INK_CcMmYK\|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y3K2c3m3k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
		356	{ 600, 600,CANON_INK_CcMmYK\|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y4K2c3m3k4_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
		357	#endif
		358	{ 600, 600,CANON_INK_CMYK\|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(7_C4M4Y4c4m4k4K4),MODE_FLAG_EXTENDED_T\|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
		359	{ 600, 600,CANON_INK_CMYK\|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(7_C4M4Y4c4m4k4K4),MODE_FLAG_EXTENDED_T\|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
		360	#if 0
		361	{ 1200,1200,CANON_INK_CcMmYK\|CANON_INK_K,"1200x1200dpi_high",N_("1200x1200 DPI HIGH"),INKSET(7_k4c4m4K4M4C4Y4),MODE_FLAG_EXTENDED_T\|MODE_FLAG_CD,NULL,2.0,2.0,NULL,NULL,NULL,0},
		362	#endif
		363	};
		364	DECLARE_MODES(canon_MULTIPASS_MP970,1);
		365
350	static const canon_mode_t canon_PIXMA_iX5000_modes[] = {	366	static const canon_mode_t canon_PIXMA_iX5000_modes[] = {
351	{ 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},	367	{ 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
352	};	368	};

Lines 185-190 Link Here

(-)gutenprint-5.2.5.orig/src/main/canon-printers.h (+18 lines)
185	NULL,	185	NULL,
186	NULL	186	NULL
187	},	187	},
		188	{ /* Canon PIXMA MP970 */
		189	"PIXMA MP970", 3, /model, model_id/
		190	842, 1772, / max paper width and height */
		191	10, 10, 15, 15, /border_left, border_right, border_top, border_bottom /
		192	8,
		193	&canon_PIXMA_iP4000_slotlist,
		194	CANON_CAP_STD0\|CANON_CAP_DUPLEX\|CANON_CAP_r\|CANON_CAP_px\|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150, /features /
		195	#if 0
		196	CANON_CAP_STD0\|CANON_CAP_DUPLEX\|CANON_CAP_r\|CANON_CAP_px\|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /features /
		197	CANON_CAP_STD0\|CANON_CAP_DUPLEX\|CANON_CAP_r\|CANON_CAP_px\|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150, /features /
		198	#endif
		199	&canon_MULTIPASS_MP970_modelist,
		200	&canon_PIXMA_iP4000_paperlist,
		201	NULL,
		202	NULL,
		203	NULL,
		204	NULL
		205	},
188	/* ******************************** */	206	/* ******************************** */
189	/* */	207	/* */
190	/* tested and color-adjusted models */	208	/* tested and color-adjusted models */