Updates after annotation class/row changes (singular/plural).

4 files changed, 227 insertions, 227 deletions

diff --git a/decoder/test/edid/acer_al711_on_dp_dm_hdmi_vga.output b/decoder/test/edid/acer_al711_on_dp_dm_hdmi_vga.output
index a4f81f4..e80de77 100644
--- a/decoder/test/edid/acer_al711_on_dp_dm_hdmi_vga.output
+++ b/decoder/test/edid/acer_al711_on_dp_dm_hdmi_vga.output
@@ -1,94 +1,94 @@
-13724-14404 edid: sections: "Offset: 0" "O: 0" "0"
-14565-14885 edid: sections: "EDID"
-14925-17765 edid: sections: "Header"
-14925-17765 edid: fields: "Header pattern"
-21685-22365 edid: fields: "ABO (Alcatel Bell)"
-22405-23085 edid: fields: "Product 0x6781"
-23125-24525 edid: fields: "Serial 670"
-29725-30405 edid: fields: "Manufactured week 1, 2003" "week 1, 2003"
-21685-30405 edid: sections: "Vendor/product"
-30445-31125 edid: sections: "EDID Version"
-30445-30765 edid: fields: "Version 1"
-30805-31125 edid: fields: "Revision 3"
-31165-38125 edid: sections: "Basic display"
-31165-31485 edid: fields: "Video input: VESA DFP 1."
-31525-32205 edid: fields: "Physical size: 34x27cm"
-32245-32565 edid: fields: "Gamma: 2.20"
-37805-38125 edid: fields: "DPMS support: standby, active off"
-37805-38125 edid: fields: "Generalized timing formula: not supported"
-38165-46885 edid: sections: "Color characteristics"
-38165-46885 edid: fields: "Chromacity red: X 0.633, Y 0.354"
-38165-46885 edid: fields: "Chromacity green: X 0.289, Y 0.598"
-38165-46885 edid: fields: "Chromacity blue: X 0.145, Y 0.106"
-38165-46885 edid: fields: "Chromacity white: X 0.305, Y 0.336"
-46925-47965 edid: sections: "Established timings"
-46925-47965 edid: fields: "Supported established modes: 720x400@70Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz, 800x600@56Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz"
-48005-64085 edid: sections: "Standard timings"
-48005-64085 edid: fields: "Supported standard modes: 1280x1024@60Hz"
-64125-80965 edid: sections: "Preferred timing descriptor"
-64125-64805 edid: fields: "Pixel clock: 108.00 MHz"
-70045-71085 edid: fields: "Horizontal active: 1280, blanking: 408"
-71125-72165 edid: fields: "Vertical active: 1024, blanking: 42"
-72205-78805 edid: fields: "Horizontal sync offset: 48, pulse width: 112, Vertical sync offset: 1, pulse width: 3" "HSync off: 48, pw: 112, VSync off: 1, pw: 3"
-78845-79885 edid: fields: "Physical size: 338x270mm"
-79925-80245 edid: fields: "Horizontal border: 0 pixels"
-80285-80605 edid: fields: "Vertical border: 0 lines"
-80645-80965 edid: fields: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
-86165-86845 edid: fields: "Flag"
-86885-87205 edid: fields: "Flag (reserved)"
-87245-87565 edid: fields: "Tag: FD"
-87605-87925 edid: fields: "Flag"
-86165-102725 edid: sections: "Monitor range limits"
-87965-88285 edid: fields: "Minimum vertical rate: 56Hz" "VSync >= 56Hz"
-88325-88645 edid: fields: "Maximum vertical rate: 75Hz" "VSync <= 75Hz"
-88685-89005 edid: fields: "Minimum horizontal rate: 24kHz" "HSync >= 24kHz"
-93965-94285 edid: fields: "Maximum horizontal rate: 80kHz" "HSync <= 80kHz"
-94325-94645 edid: fields: "Maximum pixel clock: 140MHz" "PixClk <= 140MHz"
-94685-95005 edid: fields: "Secondary timing formula unsupported" "2nd GTF: no"
-95045-102725 edid: fields: "Padding"
-102765-103445 edid: fields: "Flag"
-103485-103805 edid: fields: "Flag (reserved)"
-103845-104165 edid: fields: "Tag: FC"
-104205-104525 edid: fields: "Flag"
-102765-117685 edid: sections: "Monitor name"
-104565-117685 edid: fields: "Acer AL711"
-117725-118405 edid: fields: "Flag"
-118445-118765 edid: fields: "Flag (reserved)"
-118805-119125 edid: fields: "Tag: FF"
-124445-124765 edid: fields: "Flag"
-117725-134605 edid: sections: "Serial number"
-124805-134605 edid: fields: "ET7013010029E"
-134645-134965 edid: fields: "Extensions present: 1"
-135005-135325 edid: fields: "Checksum: 193 (OK)"
-145000-145680 edid: sections: "Offset: 128" "O: 128" "128"
-145841-146161 edid: sections: "Extension: 1" "X: 1" "1"
-146201-146521 edid: sections: "Extensions Tag" "Tag"
-146561-146881 edid: sections: "Version"
-146561-146881 edid: fields: "3"
-146921-147241 edid: sections: "DTD offset"
-146921-147241 edid: fields: "27"
-147281-147601 edid: sections: "Format support | DTD count"
-147281-147601 edid: fields: "Underscan: no, Basic Audio, YCbCr: 422+444, DTDs: 1"
-147641-170121 edid: sections: "Data block collection"
-147641-147961 edid: fields: "1: Audio Data Block" "Audio"
-148001-149041 edid: fields: "Format: 1 (LPCM) Channels: 2 Rates: 32 44 48 Extra: [07]"
-152961-153281 edid: fields: "4: Speacker Allocation Data Block" "SADB"
-153321-154361 edid: fields: "Speakers: FL/FR"
-154401-154721 edid: fields: "3: Vendor Specific Data Block" "VSDB"
-154761-162401 edid: fields: "OUI: 00 0C 03 (HDMI Licensing, LLC), PhyAddr: 1.0.0.0, [80 21]"
-162441-162761 edid: fields: "2: Video Data Block" "Video"
-162801-163841 edid: fields: "VIC: 1, 16, 4 (Native)"
-169081-169761 edid: fields: "7: Extended, 0: Video Capability Data Block" "Ext: VCDB"
-169801-170121 edid: fields: "0F"
-170161-183801 edid: sections: "DTD"
-170161-183801 edid: sections: "Preferred timing descriptor"
-170161-170841 edid: fields: "Pixel clock: 74.25 MHz"
-170881-171921 edid: fields: "Horizontal active: 1280, blanking: 370"
-173961-175001 edid: fields: "Vertical active: 720, blanking: 30"
-175041-176441 edid: fields: "Horizontal sync offset: 110, pulse width: 40, Vertical sync offset: 5, pulse width: 5" "HSync off: 110, pw: 40, VSync off: 5, pw: 5"
-176481-182721 edid: fields: "Physical size: 129x73mm"
-182761-183081 edid: fields: "Horizontal border: 0 pixels"
-183121-183441 edid: fields: "Vertical border: 0 lines"
-183481-183801 edid: fields: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
-183841-264521 edid: sections: "Padding"
-264561-264881 edid: fields: "Checksum: 191 (OK)"
+13724-14404 edid: section: "Offset: 0" "O: 0" "0"
+14565-14885 edid: section: "EDID"
+14925-17765 edid: section: "Header"
+14925-17765 edid: field: "Header pattern"
+21685-22365 edid: field: "ABO (Alcatel Bell)"
+22405-23085 edid: field: "Product 0x6781"
+23125-24525 edid: field: "Serial 670"
+29725-30405 edid: field: "Manufactured week 1, 2003" "week 1, 2003"
+21685-30405 edid: section: "Vendor/product"
+30445-31125 edid: section: "EDID Version"
+30445-30765 edid: field: "Version 1"
+30805-31125 edid: field: "Revision 3"
+31165-38125 edid: section: "Basic display"
+31165-31485 edid: field: "Video input: VESA DFP 1."
+31525-32205 edid: field: "Physical size: 34x27cm"
+32245-32565 edid: field: "Gamma: 2.20"
+37805-38125 edid: field: "DPMS support: standby, active off"
+37805-38125 edid: field: "Generalized timing formula: not supported"
+38165-46885 edid: section: "Color characteristics"
+38165-46885 edid: field: "Chromacity red: X 0.633, Y 0.354"
+38165-46885 edid: field: "Chromacity green: X 0.289, Y 0.598"
+38165-46885 edid: field: "Chromacity blue: X 0.145, Y 0.106"
+38165-46885 edid: field: "Chromacity white: X 0.305, Y 0.336"
+46925-47965 edid: section: "Established timings"
+46925-47965 edid: field: "Supported established modes: 720x400@70Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz, 800x600@56Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz"
+48005-64085 edid: section: "Standard timings"
+48005-64085 edid: field: "Supported standard modes: 1280x1024@60Hz"
+64125-80965 edid: section: "Preferred timing descriptor"
+64125-64805 edid: field: "Pixel clock: 108.00 MHz"
+70045-71085 edid: field: "Horizontal active: 1280, blanking: 408"
+71125-72165 edid: field: "Vertical active: 1024, blanking: 42"
+72205-78805 edid: field: "Horizontal sync offset: 48, pulse width: 112, Vertical sync offset: 1, pulse width: 3" "HSync off: 48, pw: 112, VSync off: 1, pw: 3"
+78845-79885 edid: field: "Physical size: 338x270mm"
+79925-80245 edid: field: "Horizontal border: 0 pixels"
+80285-80605 edid: field: "Vertical border: 0 lines"
+80645-80965 edid: field: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
+86165-86845 edid: field: "Flag"
+86885-87205 edid: field: "Flag (reserved)"
+87245-87565 edid: field: "Tag: FD"
+87605-87925 edid: field: "Flag"
+86165-102725 edid: section: "Monitor range limits"
+87965-88285 edid: field: "Minimum vertical rate: 56Hz" "VSync >= 56Hz"
+88325-88645 edid: field: "Maximum vertical rate: 75Hz" "VSync <= 75Hz"
+88685-89005 edid: field: "Minimum horizontal rate: 24kHz" "HSync >= 24kHz"
+93965-94285 edid: field: "Maximum horizontal rate: 80kHz" "HSync <= 80kHz"
+94325-94645 edid: field: "Maximum pixel clock: 140MHz" "PixClk <= 140MHz"
+94685-95005 edid: field: "Secondary timing formula unsupported" "2nd GTF: no"
+95045-102725 edid: field: "Padding"
+102765-103445 edid: field: "Flag"
+103485-103805 edid: field: "Flag (reserved)"
+103845-104165 edid: field: "Tag: FC"
+104205-104525 edid: field: "Flag"
+102765-117685 edid: section: "Monitor name"
+104565-117685 edid: field: "Acer AL711"
+117725-118405 edid: field: "Flag"
+118445-118765 edid: field: "Flag (reserved)"
+118805-119125 edid: field: "Tag: FF"
+124445-124765 edid: field: "Flag"
+117725-134605 edid: section: "Serial number"
+124805-134605 edid: field: "ET7013010029E"
+134645-134965 edid: field: "Extensions present: 1"
+135005-135325 edid: field: "Checksum: 193 (OK)"
+145000-145680 edid: section: "Offset: 128" "O: 128" "128"
+145841-146161 edid: section: "Extension: 1" "X: 1" "1"
+146201-146521 edid: section: "Extensions Tag" "Tag"
+146561-146881 edid: section: "Version"
+146561-146881 edid: field: "3"
+146921-147241 edid: section: "DTD offset"
+146921-147241 edid: field: "27"
+147281-147601 edid: section: "Format support | DTD count"
+147281-147601 edid: field: "Underscan: no, Basic Audio, YCbCr: 422+444, DTDs: 1"
+147641-170121 edid: section: "Data block collection"
+147641-147961 edid: field: "1: Audio Data Block" "Audio"
+148001-149041 edid: field: "Format: 1 (LPCM) Channels: 2 Rates: 32 44 48 Extra: [07]"
+152961-153281 edid: field: "4: Speacker Allocation Data Block" "SADB"
+153321-154361 edid: field: "Speakers: FL/FR"
+154401-154721 edid: field: "3: Vendor Specific Data Block" "VSDB"
+154761-162401 edid: field: "OUI: 00 0C 03 (HDMI Licensing, LLC), PhyAddr: 1.0.0.0, [80 21]"
+162441-162761 edid: field: "2: Video Data Block" "Video"
+162801-163841 edid: field: "VIC: 1, 16, 4 (Native)"
+169081-169761 edid: field: "7: Extended, 0: Video Capability Data Block" "Ext: VCDB"
+169801-170121 edid: field: "0F"
+170161-183801 edid: section: "DTD"
+170161-183801 edid: section: "Preferred timing descriptor"
+170161-170841 edid: field: "Pixel clock: 74.25 MHz"
+170881-171921 edid: field: "Horizontal active: 1280, blanking: 370"
+173961-175001 edid: field: "Vertical active: 720, blanking: 30"
+175041-176441 edid: field: "Horizontal sync offset: 110, pulse width: 40, Vertical sync offset: 5, pulse width: 5" "HSync off: 110, pw: 40, VSync off: 5, pw: 5"
+176481-182721 edid: field: "Physical size: 129x73mm"
+182761-183081 edid: field: "Horizontal border: 0 pixels"
+183121-183441 edid: field: "Vertical border: 0 lines"
+183481-183801 edid: field: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
+183841-264521 edid: section: "Padding"
+264561-264881 edid: field: "Checksum: 191 (OK)"
diff --git a/decoder/test/edid/samsung_le46b620r3p_fields.output b/decoder/test/edid/samsung_le46b620r3p_fields.output
index 4c5204a..db12d8f 100644
--- a/decoder/test/edid/samsung_le46b620r3p_fields.output
+++ b/decoder/test/edid/samsung_le46b620r3p_fields.output
@@ -1,54 +1,54 @@
-3444-6497 edid: fields: "Header pattern"
-6558-7289 edid: fields: "SAM (Samsung Electric Company)"
-7351-8068 edid: fields: "Product 0x0508"
-8129-9620 edid: fields: "Serial 0"
-9682-10499 edid: fields: "Manufactured week 48, 2008" "week 48, 2008"
-10562-10889 edid: fields: "Version 1"
-11006-11333 edid: fields: "Revision 3"
-11394-11721 edid: fields: "Signal level standard: 01"
-11394-11721 edid: fields: "Supported syncs: separate syncs"
-11782-12500 edid: fields: "Physical size: 88x50cm"
-12561-12888 edid: fields: "Gamma: 2.20"
-12950-13279 edid: fields: "DPMS support: active off"
-12950-13279 edid: fields: "Display type: RGB color"
-12950-13279 edid: fields: "Generalized timing formula: not supported"
-13339-17165 edid: fields: "Chromacity red: X 0.640, Y 0.330"
-13339-17165 edid: fields: "Chromacity green: X 0.297, Y 0.598"
-13339-17165 edid: fields: "Chromacity blue: X 0.150, Y 0.060"
-13339-17165 edid: fields: "Chromacity white: X 0.312, Y 0.328"
-17226-18329 edid: fields: "Supported established modes: 720x400@70Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz, 1152x870@75Hz"
-18390-24557 edid: fields: "Supported standard modes: 1152x864@75Hz, 1280x800@60Hz, 1280x960@60Hz, 1280x1024@60Hz, 1440x900@60Hz, 1440x900@75Hz, 1680x1050@60Hz"
-24618-25336 edid: fields: "Pixel clock: 148.50 MHz"
-25397-26500 edid: fields: "Horizontal active: 1920, blanking: 280"
-26561-27673 edid: fields: "Vertical active: 1080, blanking: 45"
-27735-29226 edid: fields: "Horizontal sync offset: 88, pulse width: 44, Vertical sync offset: 4, pulse width: 5" "HSync off: 88, pw: 44, VSync off: 4, pw: 5"
-29287-30400 edid: fields: "Physical size: 886x498mm"
-30461-30789 edid: fields: "Horizontal border: 0 pixels"
-30850-31177 edid: fields: "Vertical border: 0 lines"
-31238-31563 edid: fields: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
-31626-32345 edid: fields: "Pixel clock: 85.50 MHz"
-32408-33516 edid: fields: "Horizontal active: 1360, blanking: 432"
-33577-34686 edid: fields: "Vertical active: 768, blanking: 27"
-34747-36239 edid: fields: "Horizontal sync offset: 64, pulse width: 112, Vertical sync offset: 3, pulse width: 6" "HSync off: 64, pw: 112, VSync off: 3, pw: 6"
-36300-37414 edid: fields: "Physical size: 886x498mm"
-37476-37803 edid: fields: "Horizontal border: 0 pixels"
-37864-38191 edid: fields: "Vertical border: 0 lines"
-38252-38579 edid: fields: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
-38640-39356 edid: fields: "Flag"
-39417-39744 edid: fields: "Flag (reserved)"
-39805-40138 edid: fields: "Tag: FD"
-40199-40531 edid: fields: "Flag"
-40594-40921 edid: fields: "Minimum vertical rate: 60Hz" "VSync >= 60Hz"
-40982-41309 edid: fields: "Maximum vertical rate: 75Hz" "VSync <= 75Hz"
-41370-41697 edid: fields: "Minimum horizontal rate: 30kHz" "HSync >= 30kHz"
-41758-42088 edid: fields: "Maximum horizontal rate: 81kHz" "HSync <= 81kHz"
-42149-42474 edid: fields: "Maximum pixel clock: 150MHz" "PixClk <= 150MHz"
-42537-42865 edid: fields: "Secondary timing formula unsupported" "2nd GTF: no"
-42926-45584 edid: fields: "Padding"
-45645-46366 edid: fields: "Flag"
-46427-46755 edid: fields: "Flag (reserved)"
-46816-47148 edid: fields: "Tag: FC"
-47209-47545 edid: fields: "Flag"
-47606-52606 edid: fields: "SAMSUNG"
-52667-52994 edid: fields: "Extensions present: 0"
-53055-53382 edid: fields: "Checksum: 155 (OK)"
+3444-6497 edid: field: "Header pattern"
+6558-7289 edid: field: "SAM (Samsung Electric Company)"
+7351-8068 edid: field: "Product 0x0508"
+8129-9620 edid: field: "Serial 0"
+9682-10499 edid: field: "Manufactured week 48, 2008" "week 48, 2008"
+10562-10889 edid: field: "Version 1"
+11006-11333 edid: field: "Revision 3"
+11394-11721 edid: field: "Signal level standard: 01"
+11394-11721 edid: field: "Supported syncs: separate syncs"
+11782-12500 edid: field: "Physical size: 88x50cm"
+12561-12888 edid: field: "Gamma: 2.20"
+12950-13279 edid: field: "DPMS support: active off"
+12950-13279 edid: field: "Display type: RGB color"
+12950-13279 edid: field: "Generalized timing formula: not supported"
+13339-17165 edid: field: "Chromacity red: X 0.640, Y 0.330"
+13339-17165 edid: field: "Chromacity green: X 0.297, Y 0.598"
+13339-17165 edid: field: "Chromacity blue: X 0.150, Y 0.060"
+13339-17165 edid: field: "Chromacity white: X 0.312, Y 0.328"
+17226-18329 edid: field: "Supported established modes: 720x400@70Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz, 1152x870@75Hz"
+18390-24557 edid: field: "Supported standard modes: 1152x864@75Hz, 1280x800@60Hz, 1280x960@60Hz, 1280x1024@60Hz, 1440x900@60Hz, 1440x900@75Hz, 1680x1050@60Hz"
+24618-25336 edid: field: "Pixel clock: 148.50 MHz"
+25397-26500 edid: field: "Horizontal active: 1920, blanking: 280"
+26561-27673 edid: field: "Vertical active: 1080, blanking: 45"
+27735-29226 edid: field: "Horizontal sync offset: 88, pulse width: 44, Vertical sync offset: 4, pulse width: 5" "HSync off: 88, pw: 44, VSync off: 4, pw: 5"
+29287-30400 edid: field: "Physical size: 886x498mm"
+30461-30789 edid: field: "Horizontal border: 0 pixels"
+30850-31177 edid: field: "Vertical border: 0 lines"
+31238-31563 edid: field: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
+31626-32345 edid: field: "Pixel clock: 85.50 MHz"
+32408-33516 edid: field: "Horizontal active: 1360, blanking: 432"
+33577-34686 edid: field: "Vertical active: 768, blanking: 27"
+34747-36239 edid: field: "Horizontal sync offset: 64, pulse width: 112, Vertical sync offset: 3, pulse width: 6" "HSync off: 64, pw: 112, VSync off: 3, pw: 6"
+36300-37414 edid: field: "Physical size: 886x498mm"
+37476-37803 edid: field: "Horizontal border: 0 pixels"
+37864-38191 edid: field: "Vertical border: 0 lines"
+38252-38579 edid: field: "Flags: sync type digital separate (Vsync polarity positive, Hsync polarity positive)"
+38640-39356 edid: field: "Flag"
+39417-39744 edid: field: "Flag (reserved)"
+39805-40138 edid: field: "Tag: FD"
+40199-40531 edid: field: "Flag"
+40594-40921 edid: field: "Minimum vertical rate: 60Hz" "VSync >= 60Hz"
+40982-41309 edid: field: "Maximum vertical rate: 75Hz" "VSync <= 75Hz"
+41370-41697 edid: field: "Minimum horizontal rate: 30kHz" "HSync >= 30kHz"
+41758-42088 edid: field: "Maximum horizontal rate: 81kHz" "HSync <= 81kHz"
+42149-42474 edid: field: "Maximum pixel clock: 150MHz" "PixClk <= 150MHz"
+42537-42865 edid: field: "Secondary timing formula unsupported" "2nd GTF: no"
+42926-45584 edid: field: "Padding"
+45645-46366 edid: field: "Flag"
+46427-46755 edid: field: "Flag (reserved)"
+46816-47148 edid: field: "Tag: FC"
+47209-47545 edid: field: "Flag"
+47606-52606 edid: field: "SAMSUNG"
+52667-52994 edid: field: "Extensions present: 0"
+53055-53382 edid: field: "Checksum: 155 (OK)"
diff --git a/decoder/test/edid/samsung_le46b620r3p_sections.output b/decoder/test/edid/samsung_le46b620r3p_sections.output
index 59618a4..ad69b05 100644
--- a/decoder/test/edid/samsung_le46b620r3p_sections.output
+++ b/decoder/test/edid/samsung_le46b620r3p_sections.output
@@ -1,14 +1,14 @@
-1051-1458 edid: sections: "EDID"
-1981-2863 edid: sections: "Offset: 0" "O: 0" "0"
-2985-3393 edid: sections: "EDID"
-3444-6497 edid: sections: "Header"
-6558-10499 edid: sections: "Vendor/product"
-10562-11333 edid: sections: "EDID Version"
-11394-13279 edid: sections: "Basic display"
-13339-17165 edid: sections: "Color characteristics"
-17226-18329 edid: sections: "Established timings"
-18390-24557 edid: sections: "Standard timings"
-24618-31563 edid: sections: "Preferred timing descriptor"
-31626-38579 edid: sections: "Detailed timing descriptor"
-38640-45584 edid: sections: "Monitor range limits"
-45645-52606 edid: sections: "Monitor name"
+1051-1458 edid: section: "EDID"
+1981-2863 edid: section: "Offset: 0" "O: 0" "0"
+2985-3393 edid: section: "EDID"
+3444-6497 edid: section: "Header"
+6558-10499 edid: section: "Vendor/product"
+10562-11333 edid: section: "EDID Version"
+11394-13279 edid: section: "Basic display"
+13339-17165 edid: section: "Color characteristics"
+17226-18329 edid: section: "Established timings"
+18390-24557 edid: section: "Standard timings"
+24618-31563 edid: section: "Preferred timing descriptor"
+31626-38579 edid: section: "Detailed timing descriptor"
+38640-45584 edid: section: "Monitor range limits"
+45645-52606 edid: section: "Monitor name"
diff --git a/decoder/test/edid/samsung_syncmaster245b.output b/decoder/test/edid/samsung_syncmaster245b.output
index 531a1c8..38931cb 100644
--- a/decoder/test/edid/samsung_syncmaster245b.output
+++ b/decoder/test/edid/samsung_syncmaster245b.output
@@ -1,65 +1,65 @@
-1041-1449 edid: sections: "EDID"
-1970-2839 edid: sections: "Offset: 0" "O: 0" "0"
-2964-3372 edid: sections: "EDID"
-3424-6555 edid: sections: "Header"
-3424-6555 edid: fields: "Header pattern"
-6615-7330 edid: fields: "SAM (Samsung Electric Company)"
-7392-8107 edid: fields: "Product 0x02b5"
-8168-9658 edid: fields: "Serial HU24"
-9721-10442 edid: fields: "Manufactured week 1, 2008" "week 1, 2008"
-6615-10442 edid: sections: "Vendor/product"
-10504-11217 edid: sections: "EDID Version"
-10504-10831 edid: fields: "Version 1"
-10892-11217 edid: fields: "Revision 3"
-11280-13157 edid: sections: "Basic display"
-11280-11606 edid: fields: "Signal level standard: 00"
-11280-11606 edid: fields: "Supported syncs: separate syncs, composite syncs, sync on green"
-11667-12382 edid: fields: "Physical size: 52x32cm"
-12443-12771 edid: fields: "Gamma: 2.60"
-12832-13157 edid: fields: "DPMS support: active off"
-12832-13157 edid: fields: "Display type: RGB color"
-12832-13157 edid: fields: "Generalized timing formula: not supported"
-13220-17040 edid: sections: "Color characteristics"
-13220-17040 edid: fields: "Chromacity red: X 0.653, Y 0.337"
-13220-17040 edid: fields: "Chromacity green: X 0.293, Y 0.605"
-13220-17040 edid: fields: "Chromacity blue: X 0.144, Y 0.075"
-13220-17040 edid: fields: "Chromacity white: X 0.312, Y 0.328"
-17101-18203 edid: sections: "Established timings"
-17101-18203 edid: fields: "Supported established modes: 720x400@70Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz, 800x600@56Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz, 1152x870@75Hz"
-18264-24409 edid: sections: "Standard timings"
-18264-24409 edid: fields: "Supported standard modes: 1600x1200@60Hz, 1280x1024@60Hz, 1280x960@60Hz, 1152x864@75Hz"
-24470-31391 edid: sections: "Preferred timing descriptor"
-24470-25185 edid: fields: "Pixel clock: 154.00 MHz"
-25246-26348 edid: fields: "Horizontal active: 1920, blanking: 160"
-26409-27511 edid: fields: "Vertical active: 1200, blanking: 35"
-27574-29065 edid: fields: "Horizontal sync offset: 48, pulse width: 32, Vertical sync offset: 3, pulse width: 6" "HSync off: 48, pw: 32, VSync off: 3, pw: 6"
-29126-30228 edid: fields: "Physical size: 518x324mm"
-30289-30618 edid: fields: "Horizontal border: 0 pixels"
-30678-31005 edid: fields: "Vertical border: 0 lines"
-31066-31391 edid: fields: "Flags: sync type digital separate (Vsync polarity negative, Hsync polarity positive)"
-31454-32168 edid: fields: "Flag"
-32229-32556 edid: fields: "Flag (reserved)"
-32617-32944 edid: fields: "Tag: FD"
-33005-33332 edid: fields: "Flag"
-31454-38375 edid: sections: "Monitor range limits"
-33393-33720 edid: fields: "Minimum vertical rate: 56Hz" "VSync >= 56Hz"
-33781-34108 edid: fields: "Maximum vertical rate: 75Hz" "VSync <= 75Hz"
-34169-34496 edid: fields: "Minimum horizontal rate: 30kHz" "HSync >= 30kHz"
-34557-34884 edid: fields: "Maximum horizontal rate: 81kHz" "HSync <= 81kHz"
-34945-35271 edid: fields: "Maximum pixel clock: 170MHz" "PixClk <= 170MHz"
-35332-35659 edid: fields: "Secondary timing formula unsupported" "2nd GTF: no"
-35720-38375 edid: fields: "Padding"
-38436-39152 edid: fields: "Flag"
-39213-39538 edid: fields: "Flag (reserved)"
-39600-39927 edid: fields: "Tag: FC"
-39988-40314 edid: fields: "Flag"
-38436-45359 edid: sections: "Monitor name"
-40377-45359 edid: fields: "SyncMaster"
-45420-46135 edid: fields: "Flag"
-46196-46523 edid: fields: "Flag (reserved)"
-46585-46912 edid: fields: "Tag: FF"
-46973-47300 edid: fields: "Flag"
-45420-52348 edid: sections: "Serial number"
-47361-52348 edid: fields: "HS1Q102936"
-52409-52736 edid: fields: "Extensions present: 0"
-52797-53122 edid: fields: "Checksum: 64 (OK)"
+1041-1449 edid: section: "EDID"
+1970-2839 edid: section: "Offset: 0" "O: 0" "0"
+2964-3372 edid: section: "EDID"
+3424-6555 edid: section: "Header"
+3424-6555 edid: field: "Header pattern"
+6615-7330 edid: field: "SAM (Samsung Electric Company)"
+7392-8107 edid: field: "Product 0x02b5"
+8168-9658 edid: field: "Serial HU24"
+9721-10442 edid: field: "Manufactured week 1, 2008" "week 1, 2008"
+6615-10442 edid: section: "Vendor/product"
+10504-11217 edid: section: "EDID Version"
+10504-10831 edid: field: "Version 1"
+10892-11217 edid: field: "Revision 3"
+11280-13157 edid: section: "Basic display"
+11280-11606 edid: field: "Signal level standard: 00"
+11280-11606 edid: field: "Supported syncs: separate syncs, composite syncs, sync on green"
+11667-12382 edid: field: "Physical size: 52x32cm"
+12443-12771 edid: field: "Gamma: 2.60"
+12832-13157 edid: field: "DPMS support: active off"
+12832-13157 edid: field: "Display type: RGB color"
+12832-13157 edid: field: "Generalized timing formula: not supported"
+13220-17040 edid: section: "Color characteristics"
+13220-17040 edid: field: "Chromacity red: X 0.653, Y 0.337"
+13220-17040 edid: field: "Chromacity green: X 0.293, Y 0.605"
+13220-17040 edid: field: "Chromacity blue: X 0.144, Y 0.075"
+13220-17040 edid: field: "Chromacity white: X 0.312, Y 0.328"
+17101-18203 edid: section: "Established timings"
+17101-18203 edid: field: "Supported established modes: 720x400@70Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz, 800x600@56Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz, 1152x870@75Hz"
+18264-24409 edid: section: "Standard timings"
+18264-24409 edid: field: "Supported standard modes: 1600x1200@60Hz, 1280x1024@60Hz, 1280x960@60Hz, 1152x864@75Hz"
+24470-31391 edid: section: "Preferred timing descriptor"
+24470-25185 edid: field: "Pixel clock: 154.00 MHz"
+25246-26348 edid: field: "Horizontal active: 1920, blanking: 160"
+26409-27511 edid: field: "Vertical active: 1200, blanking: 35"
+27574-29065 edid: field: "Horizontal sync offset: 48, pulse width: 32, Vertical sync offset: 3, pulse width: 6" "HSync off: 48, pw: 32, VSync off: 3, pw: 6"
+29126-30228 edid: field: "Physical size: 518x324mm"
+30289-30618 edid: field: "Horizontal border: 0 pixels"
+30678-31005 edid: field: "Vertical border: 0 lines"
+31066-31391 edid: field: "Flags: sync type digital separate (Vsync polarity negative, Hsync polarity positive)"
+31454-32168 edid: field: "Flag"
+32229-32556 edid: field: "Flag (reserved)"
+32617-32944 edid: field: "Tag: FD"
+33005-33332 edid: field: "Flag"
+31454-38375 edid: section: "Monitor range limits"
+33393-33720 edid: field: "Minimum vertical rate: 56Hz" "VSync >= 56Hz"
+33781-34108 edid: field: "Maximum vertical rate: 75Hz" "VSync <= 75Hz"
+34169-34496 edid: field: "Minimum horizontal rate: 30kHz" "HSync >= 30kHz"
+34557-34884 edid: field: "Maximum horizontal rate: 81kHz" "HSync <= 81kHz"
+34945-35271 edid: field: "Maximum pixel clock: 170MHz" "PixClk <= 170MHz"
+35332-35659 edid: field: "Secondary timing formula unsupported" "2nd GTF: no"
+35720-38375 edid: field: "Padding"
+38436-39152 edid: field: "Flag"
+39213-39538 edid: field: "Flag (reserved)"
+39600-39927 edid: field: "Tag: FC"
+39988-40314 edid: field: "Flag"
+38436-45359 edid: section: "Monitor name"
+40377-45359 edid: field: "SyncMaster"
+45420-46135 edid: field: "Flag"
+46196-46523 edid: field: "Flag (reserved)"
+46585-46912 edid: field: "Tag: FF"
+46973-47300 edid: field: "Flag"
+45420-52348 edid: section: "Serial number"
+47361-52348 edid: field: "HS1Q102936"
+52409-52736 edid: field: "Extensions present: 0"
+52797-53122 edid: field: "Checksum: 64 (OK)"