diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-08-27 22:27:09 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-08-27 22:27:09 -0400 |
| commit | bc5060a1ddee63b524a3f61a939c24829f727fc7 (patch) | |
| tree | f4157f352d6b00dbb0ac1f620a82fb15043b1e70 /cups | |
| parent | ee6be9cd7e863abf36b9b131fc379d967414aa2e (diff) | |
| download | cups-bc5060a1ddee63b524a3f61a939c24829f727fc7.tar.gz | |
Fix spelling of "accordion".
Bump version.
Diffstat (limited to 'cups')
| -rw-r--r-- | cups/cups.h | 4 | ||||
| -rw-r--r-- | cups/ipp-support.c | 4 | ||||
| -rw-r--r-- | cups/ipp.h | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/cups/cups.h b/cups/cups.h index e64fdcc96..77a66c17b 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -42,10 +42,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0300 +# define CUPS_VERSION 2.0301 # define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MINOR 3 -# define CUPS_VERSION_PATCH 0 +# define CUPS_VERSION_PATCH 1 # define CUPS_BC_FD 3 /* Back-channel file descriptor for diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 7d028b4f2..192f5b6b8 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -460,7 +460,7 @@ static const char * const ipp_document_states[] = "punch-multiple-top", /* IPP Finishings 2.1/Canon */ "punch-multiple-right",/* IPP Finishings 2.1/Canon */ "punch-multiple-bottom",/* IPP Finishings 2.1/Canon */ - "fold-accordian", /* IPP Finishings 2.0 */ + "fold-accordion", /* IPP Finishings 2.0 */ "fold-double-gate", /* IPP Finishings 2.0 */ "fold-gate", /* IPP Finishings 2.0 */ "fold-half", /* IPP Finishings 2.0 */ @@ -571,7 +571,7 @@ static const char * const ipp_document_states[] = "0x40000057", "0x40000058", "0x40000059", - "cups-fold-accordian", + "cups-fold-accordion", "cups-fold-double-gate", "cups-fold-gate", "cups-fold-half", diff --git a/cups/ipp.h b/cups/ipp.h index 6402855a7..1f2fd8edf 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -149,7 +149,7 @@ typedef enum ipp_finishings_e /**** Finishings values ****/ IPP_FINISHINGS_PUNCH_MULTIPLE_TOP, /* Pucnh multiple holes top edge */ IPP_FINISHINGS_PUNCH_MULTIPLE_RIGHT, /* Pucnh multiple holes right side */ IPP_FINISHINGS_PUNCH_MULTIPLE_BOTTOM, /* Pucnh multiple holes bottom edge */ - IPP_FINISHINGS_FOLD_ACCORDIAN = 90, /* Accordian-fold the paper vertically into four sections */ + IPP_FINISHINGS_FOLD_ACCORDION = 90, /* Accordion-fold the paper vertically into four sections */ IPP_FINISHINGS_FOLD_DOUBLE_GATE, /* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically */ IPP_FINISHINGS_FOLD_GATE, /* Fold the top and bottom quarters of the paper towards the midline */ IPP_FINISHINGS_FOLD_HALF, /* Fold the paper in half vertically */ @@ -184,8 +184,8 @@ typedef enum ipp_finishings_e /**** Finishings values ****/ IPP_FINISHINGS_CUPS_PUNCH_QUAD_RIGHT, /* Punch 4 holes right side @exclude all@ */ IPP_FINISHINGS_CUPS_PUNCH_QUAD_BOTTOM,/* Punch 4 holes bottom edge @exclude all@ */ - IPP_FINISHINGS_CUPS_FOLD_ACCORDIAN = 0x4000005A, - /* Accordian-fold the paper vertically into four sections @exclude all@ */ + IPP_FINISHINGS_CUPS_FOLD_ACCORDION = 0x4000005A, + /* Accordion-fold the paper vertically into four sections @exclude all@ */ IPP_FINISHINGS_CUPS_FOLD_DOUBLE_GATE, /* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically @exclude all@ */ IPP_FINISHINGS_CUPS_FOLD_GATE, /* Fold the top and bottom quarters of the paper towards the midline @exclude all@ */ IPP_FINISHINGS_CUPS_FOLD_HALF, /* Fold the paper in half vertically @exclude all@ */ @@ -198,8 +198,10 @@ typedef enum ipp_finishings_e /**** Finishings values ****/ IPP_FINISHINGS_CUPS_FOLD_Z /* Fold the paper vertically into three sections, forming a Z @exclude all@ */ } ipp_finishings_t; # ifndef _CUPS_NO_DEPRECATED +# define IPP_FINISHINGS_CUPS_FOLD_ACCORDIAN IPP_FINISHINGS_CUPS_FOLD_ACCORDION +# define IPP_FINISHINGS_FOLD_ACCORDIAN IPP_FINISHINGS_FOLD_ACCORDION # define IPP_FINISHINGS_JOB_OFFSET IPP_FINISHINGS_JOG_OFFSET - /* Long-time misspelling... */ + /* Long-time misspellings... */ typedef enum ipp_finishings_e ipp_finish_t; # endif /* !_CUPS_NO_DEPRECATED */ |