ppdLoadAttributes(): Apply cfIEEE1284NormalizeMakeModel() to NickName

The PPD's NickName sometimes contains manufacturer and model,
sometimes only the model, not the manufacturer. And manufacturer names
can be completely missing or messy.

By using cfIEEE1284NormalizeMakeModel() we clean this up and have
clear manufacturer names, for better answers print clients and correct
application of quirk rules, especially by the ppdFilterPDFToPS()
filter function.

Improved solution for Pull Request #21.

Author: tillkamppeter

ppd/ppd-ipp.c

@@ -1383,10 +1383,13 @@ ppdLoadAttributes(
 		      printer_input_tray, (int)strlen(printer_input_tray));
   }
 
-  // printer-make-andXS-model
-  char	make_model[128];		// Manufacturer and Model value
-
-  snprintf(make_model, sizeof(make_model), "%s %s", ppd->manufacturer, ppd->nickname);
+  // printer-make-and-model
+  char	make_model[256];		// Manufacturer and Model value
+  if (cfIEEE1284NormalizeMakeModel(ppd->nickname, ppd->manufacturer,
+				   CF_IEEE1284_NORMALIZE_HUMAN,
+				   NULL, make_model, sizeof(make_model),
+				   NULL, NULL, NULL) == NULL)
+    snprintf(make_model, sizeof(make_model), "%s", ppd->nickname);
   ippAddString(attrs, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-make-and-model",
 	       NULL, make_model);
 

ppd/ppd.h

@@ -25,6 +25,7 @@
 #  include <cups/raster.h>
 #  include <cupsfilters/log.h>
 #  include <cupsfilters/driver.h>
+#  include <cupsfilters/ieee1284.h>
 
 
 //