diff --git a/CHANGELOG.md b/CHANGELOG.md index 5289cbac4..24e60c775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add `appearance-auto` utility ([#12404](https://github.com/tailwindlabs/tailwindcss/pull/12404)) - Add logical property values for `float` and `clear` utilities ([#12480](https://github.com/tailwindlabs/tailwindcss/pull/12480)) +### Changed + +- Simplify the `sans` font-family stack ([#11748](https://github.com/tailwindlabs/tailwindcss/pull/11748)) + ## [3.3.7] - 2023-12-18 ### Fixed diff --git a/src/css/preflight.css b/src/css/preflight.css index a3fcfc249..42d2c65cf 100644 --- a/src/css/preflight.css +++ b/src/css/preflight.css @@ -32,7 +32,7 @@ html, -webkit-text-size-adjust: 100%; /* 2 */ -moz-tab-size: 4; /* 3 */ tab-size: 4; /* 3 */ - font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */ + font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */ font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */ font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */ } diff --git a/stubs/config.full.js b/stubs/config.full.js index e1578c6e7..8eddd4898 100644 --- a/stubs/config.full.js +++ b/stubs/config.full.js @@ -303,13 +303,6 @@ module.exports = { sans: [ 'ui-sans-serif', 'system-ui', - '-apple-system', - 'BlinkMacSystemFont', - '"Segoe UI"', - 'Roboto', - '"Helvetica Neue"', - 'Arial', - '"Noto Sans"', 'sans-serif', '"Apple Color Emoji"', '"Segoe UI Emoji"', diff --git a/tests/basic-usage.oxide.test.css b/tests/basic-usage.oxide.test.css index 6e2d6652d..2c102b7a3 100644 --- a/tests/basic-usage.oxide.test.css +++ b/tests/basic-usage.oxide.test.css @@ -767,9 +767,8 @@ vertical-align: middle; } .font-sans { - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, - Noto Color Emoji; + font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, + Segoe UI Symbol, Noto Color Emoji; } .text-2xl { font-size: 1.5rem; diff --git a/tests/basic-usage.test.css b/tests/basic-usage.test.css index 80c406bf6..17600764a 100644 --- a/tests/basic-usage.test.css +++ b/tests/basic-usage.test.css @@ -785,9 +785,8 @@ vertical-align: middle; } .font-sans { - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, - Noto Color Emoji; + font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, + Segoe UI Symbol, Noto Color Emoji; } .text-2xl { font-size: 1.5rem; diff --git a/tests/kitchen-sink.test.js b/tests/kitchen-sink.test.js index 3b02c8966..5923de27e 100644 --- a/tests/kitchen-sink.test.js +++ b/tests/kitchen-sink.test.js @@ -240,8 +240,7 @@ crosscheck(({ stable, oxide }) => { stable.expect(result.css).toMatchFormattedCss(css` .theme-test { color: #3b82f6; - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, + font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji; } @media (min-width: 1024px) { @@ -813,8 +812,7 @@ crosscheck(({ stable, oxide }) => { oxide.expect(result.css).toMatchFormattedCss(css` .theme-test { color: #3b82f6; - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, + font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji; } @media (min-width: 1024px) { diff --git a/tests/raw-content.oxide.test.css b/tests/raw-content.oxide.test.css index aa5abd127..3408975df 100644 --- a/tests/raw-content.oxide.test.css +++ b/tests/raw-content.oxide.test.css @@ -512,9 +512,8 @@ vertical-align: middle; } .font-sans { - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, - Noto Color Emoji; + font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, + Segoe UI Symbol, Noto Color Emoji; } .text-2xl { font-size: 1.5rem; diff --git a/tests/raw-content.test.css b/tests/raw-content.test.css index dba9f3194..a6be31fd0 100644 --- a/tests/raw-content.test.css +++ b/tests/raw-content.test.css @@ -524,9 +524,8 @@ vertical-align: middle; } .font-sans { - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, - Noto Color Emoji; + font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, + Segoe UI Symbol, Noto Color Emoji; } .text-2xl { font-size: 1.5rem; diff --git a/tests/resolveConfig.test.js b/tests/resolveConfig.test.js index c99a986de..69a62bba5 100644 --- a/tests/resolveConfig.test.js +++ b/tests/resolveConfig.test.js @@ -150,7 +150,7 @@ crosscheck(() => { 'grey-lighter': '#f1f5f8', }, fonts: { - sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'], + sans: ['system-ui', 'Roboto', 'sans-serif'], serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'], }, screens: { @@ -176,7 +176,7 @@ crosscheck(() => { 'grey-lighter': '#f1f5f8', }, fonts: { - sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'], + sans: ['system-ui', 'Roboto', 'sans-serif'], serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'], }, screens: { diff --git a/tests/source-maps.test.js b/tests/source-maps.test.js index 75bfd84fc..e783137a6 100644 --- a/tests/source-maps.test.js +++ b/tests/source-maps.test.js @@ -100,307 +100,307 @@ crosscheck(({ stable, oxide }) => { '2:6 -> 22:0', '2:20 -> 29:1', '2:6 -> 31:0', - '2:6-20 -> 32:2-26', - '2:6-20 -> 33:2-40', - '2:6-20 -> 34:2-26', - '2:6-20 -> 35:2-21', - '2:6-20 -> 36:2-230', - '2:6-20 -> 37:2-39', - '2:6-20 -> 38:2-41', - '2:20 -> 39:0', - '2:6 -> 41:0', - '2:20 -> 44:1', - '2:6 -> 46:0', - '2:6-20 -> 47:2-19', - '2:6-20 -> 48:2-30', - '2:20 -> 49:0', - '2:6 -> 51:0', - '2:20 -> 55:1', - '2:6 -> 57:0', - '2:6-20 -> 58:2-19', - '2:6-20 -> 59:2-24', - '2:6-20 -> 60:2-31', - '2:20 -> 61:0', - '2:6 -> 63:0', - '2:20 -> 65:1', - '2:6 -> 67:0', - '2:6-20 -> 68:2-35', - '2:20 -> 69:0', - '2:6 -> 71:0', - '2:20 -> 73:1', - '2:6 -> 75:0', - '2:6-20 -> 81:2-20', - '2:6-20 -> 82:2-22', - '2:20 -> 83:0', - '2:6 -> 85:0', - '2:20 -> 87:1', - '2:6 -> 89:0', - '2:6-20 -> 90:2-16', - '2:6-20 -> 91:2-26', - '2:20 -> 92:0', - '2:6 -> 94:0', - '2:20 -> 96:1', - '2:6 -> 98:0', - '2:6-20 -> 100:2-21', - '2:20 -> 101:0', - '2:6 -> 103:0', - '2:20 -> 108:1', - '2:6 -> 110:0', - '2:6-20 -> 114:2-121', - '2:6-20 -> 115:2-39', - '2:6-20 -> 116:2-41', - '2:6-20 -> 117:2-24', - '2:20 -> 118:0', - '2:6 -> 120:0', - '2:20 -> 122:1', - '2:6 -> 124:0', - '2:6-20 -> 125:2-16', - '2:20 -> 126:0', - '2:6 -> 128:0', - '2:20 -> 130:1', - '2:6 -> 132:0', - '2:6-20 -> 134:2-16', + '2:6-20 -> 33:2-26', + '2:6-20 -> 34:2-40', + '2:6-20 -> 35:2-26', + '2:6-20 -> 36:2-21', + '2:6-20 -> 37:2-137', + '2:6-20 -> 38:2-39', + '2:6-20 -> 39:2-41', + '2:20 -> 40:0', + '2:6 -> 42:0', + '2:20 -> 45:1', + '2:6 -> 47:0', + '2:6-20 -> 48:2-19', + '2:6-20 -> 49:2-30', + '2:20 -> 50:0', + '2:6 -> 52:0', + '2:20 -> 56:1', + '2:6 -> 58:0', + '2:6-20 -> 59:2-19', + '2:6-20 -> 60:2-24', + '2:6-20 -> 61:2-31', + '2:20 -> 62:0', + '2:6 -> 64:0', + '2:20 -> 66:1', + '2:6 -> 68:0', + '2:6-20 -> 69:2-35', + '2:20 -> 70:0', + '2:6 -> 72:0', + '2:20 -> 74:1', + '2:6 -> 76:0', + '2:6-20 -> 82:2-20', + '2:6-20 -> 83:2-22', + '2:20 -> 84:0', + '2:6 -> 86:0', + '2:20 -> 88:1', + '2:6 -> 90:0', + '2:6-20 -> 91:2-16', + '2:6-20 -> 92:2-26', + '2:20 -> 93:0', + '2:6 -> 95:0', + '2:20 -> 97:1', + '2:6 -> 99:0', + '2:6-20 -> 101:2-21', + '2:20 -> 102:0', + '2:6 -> 104:0', + '2:20 -> 109:1', + '2:6 -> 111:0', + '2:6-20 -> 115:2-121', + '2:6-20 -> 116:2-39', + '2:6-20 -> 117:2-41', + '2:6-20 -> 118:2-24', + '2:20 -> 119:0', + '2:6 -> 121:0', + '2:20 -> 123:1', + '2:6 -> 125:0', + '2:6-20 -> 126:2-16', + '2:20 -> 127:0', + '2:6 -> 129:0', + '2:20 -> 131:1', + '2:6 -> 133:0', '2:6-20 -> 135:2-16', - '2:6-20 -> 136:2-20', - '2:6-20 -> 137:2-26', - '2:20 -> 138:0', - '2:6 -> 140:0', - '2:6-20 -> 141:2-17', - '2:20 -> 142:0', - '2:6 -> 144:0', - '2:6-20 -> 145:2-13', - '2:20 -> 146:0', - '2:6 -> 148:0', - '2:20 -> 152:1', - '2:6 -> 154:0', - '2:6-20 -> 155:2-24', - '2:6-20 -> 156:2-31', - '2:6-20 -> 157:2-35', - '2:20 -> 158:0', - '2:6 -> 160:0', - '2:20 -> 164:1', - '2:6 -> 166:0', - '2:6-20 -> 171:2-30', - '2:6-20 -> 172:2-40', - '2:6-20 -> 173:2-42', - '2:6-20 -> 174:2-25', - '2:6-20 -> 175:2-30', + '2:6-20 -> 136:2-16', + '2:6-20 -> 137:2-20', + '2:6-20 -> 138:2-26', + '2:20 -> 139:0', + '2:6 -> 141:0', + '2:6-20 -> 142:2-17', + '2:20 -> 143:0', + '2:6 -> 145:0', + '2:6-20 -> 146:2-13', + '2:20 -> 147:0', + '2:6 -> 149:0', + '2:20 -> 153:1', + '2:6 -> 155:0', + '2:6-20 -> 156:2-24', + '2:6-20 -> 157:2-31', + '2:6-20 -> 158:2-35', + '2:20 -> 159:0', + '2:6 -> 161:0', + '2:20 -> 165:1', + '2:6 -> 167:0', + '2:6-20 -> 172:2-30', + '2:6-20 -> 173:2-40', + '2:6-20 -> 174:2-42', + '2:6-20 -> 175:2-25', '2:6-20 -> 176:2-30', - '2:6-20 -> 177:2-24', - '2:6-20 -> 178:2-19', - '2:6-20 -> 179:2-20', - '2:20 -> 180:0', - '2:6 -> 182:0', - '2:20 -> 184:1', - '2:6 -> 186:0', - '2:6-20 -> 188:2-22', - '2:20 -> 189:0', - '2:6 -> 191:0', - '2:20 -> 194:1', - '2:6 -> 196:0', - '2:6-20 -> 200:2-36', - '2:6-20 -> 201:2-39', - '2:6-20 -> 202:2-32', - '2:20 -> 203:0', - '2:6 -> 205:0', - '2:20 -> 207:1', - '2:6 -> 209:0', - '2:6-20 -> 210:2-15', - '2:20 -> 211:0', - '2:6 -> 213:0', - '2:20 -> 215:1', - '2:6 -> 217:0', - '2:6-20 -> 218:2-18', - '2:20 -> 219:0', - '2:6 -> 221:0', - '2:20 -> 223:1', - '2:6 -> 225:0', - '2:6-20 -> 226:2-26', - '2:20 -> 227:0', - '2:6 -> 229:0', - '2:20 -> 231:1', - '2:6 -> 233:0', - '2:6-20 -> 235:2-14', - '2:20 -> 236:0', - '2:6 -> 238:0', - '2:20 -> 241:1', - '2:6 -> 243:0', - '2:6-20 -> 244:2-39', - '2:6-20 -> 245:2-30', - '2:20 -> 246:0', - '2:6 -> 248:0', - '2:20 -> 250:1', - '2:6 -> 252:0', - '2:6-20 -> 253:2-26', - '2:20 -> 254:0', - '2:6 -> 256:0', - '2:20 -> 259:1', - '2:6 -> 261:0', - '2:6-20 -> 262:2-36', - '2:6-20 -> 263:2-23', - '2:20 -> 264:0', - '2:6 -> 266:0', - '2:20 -> 268:1', - '2:6 -> 270:0', - '2:6-20 -> 271:2-20', - '2:20 -> 272:0', - '2:6 -> 274:0', - '2:20 -> 276:1', - '2:6 -> 278:0', - '2:6-20 -> 291:2-11', - '2:20 -> 292:0', - '2:6 -> 294:0', - '2:6-20 -> 295:2-11', - '2:6-20 -> 296:2-12', - '2:20 -> 297:0', - '2:6 -> 299:0', - '2:6-20 -> 300:2-12', - '2:20 -> 301:0', - '2:6 -> 303:0', - '2:6-20 -> 306:2-18', - '2:6-20 -> 307:2-11', - '2:6-20 -> 308:2-12', - '2:20 -> 309:0', - '2:6 -> 311:0', - '2:20 -> 313:1', - '2:6 -> 314:0', - '2:6-20 -> 315:2-12', - '2:20 -> 316:0', - '2:6 -> 318:0', - '2:20 -> 320:1', - '2:6 -> 322:0', - '2:6-20 -> 323:2-18', - '2:20 -> 324:0', - '2:6 -> 326:0', - '2:20 -> 329:1', - '2:6 -> 331:0', - '2:6-20 -> 333:2-20', - '2:6-20 -> 334:2-24', - '2:20 -> 335:0', - '2:6 -> 337:0', - '2:20 -> 339:1', - '2:6 -> 341:0', - '2:6-20 -> 343:2-17', - '2:20 -> 344:0', - '2:6 -> 346:0', - '2:20 -> 348:1', - '2:6 -> 349:0', - '2:6-20 -> 350:2-17', - '2:20 -> 351:0', - '2:6 -> 353:0', - '2:20 -> 357:1', - '2:6 -> 359:0', - '2:6-20 -> 367:2-24', - '2:6-20 -> 368:2-32', - '2:20 -> 369:0', - '2:6 -> 371:0', - '2:20 -> 373:1', - '2:6 -> 375:0', - '2:6-20 -> 377:2-17', - '2:6-20 -> 378:2-14', - '2:20 -> 379:0', - '2:6-20 -> 381:0-72', - '2:6 -> 382:0', - '2:6-20 -> 383:2-15', - '2:20 -> 384:0', - '2:6 -> 386:0', - '2:6-20 -> 387:2-26', + '2:6-20 -> 177:2-30', + '2:6-20 -> 178:2-24', + '2:6-20 -> 179:2-19', + '2:6-20 -> 180:2-20', + '2:20 -> 181:0', + '2:6 -> 183:0', + '2:20 -> 185:1', + '2:6 -> 187:0', + '2:6-20 -> 189:2-22', + '2:20 -> 190:0', + '2:6 -> 192:0', + '2:20 -> 195:1', + '2:6 -> 197:0', + '2:6-20 -> 201:2-36', + '2:6-20 -> 202:2-39', + '2:6-20 -> 203:2-32', + '2:20 -> 204:0', + '2:6 -> 206:0', + '2:20 -> 208:1', + '2:6 -> 210:0', + '2:6-20 -> 211:2-15', + '2:20 -> 212:0', + '2:6 -> 214:0', + '2:20 -> 216:1', + '2:6 -> 218:0', + '2:6-20 -> 219:2-18', + '2:20 -> 220:0', + '2:6 -> 222:0', + '2:20 -> 224:1', + '2:6 -> 226:0', + '2:6-20 -> 227:2-26', + '2:20 -> 228:0', + '2:6 -> 230:0', + '2:20 -> 232:1', + '2:6 -> 234:0', + '2:6-20 -> 236:2-14', + '2:20 -> 237:0', + '2:6 -> 239:0', + '2:20 -> 242:1', + '2:6 -> 244:0', + '2:6-20 -> 245:2-39', + '2:6-20 -> 246:2-30', + '2:20 -> 247:0', + '2:6 -> 249:0', + '2:20 -> 251:1', + '2:6 -> 253:0', + '2:6-20 -> 254:2-26', + '2:20 -> 255:0', + '2:6 -> 257:0', + '2:20 -> 260:1', + '2:6 -> 262:0', + '2:6-20 -> 263:2-36', + '2:6-20 -> 264:2-23', + '2:20 -> 265:0', + '2:6 -> 267:0', + '2:20 -> 269:1', + '2:6 -> 271:0', + '2:6-20 -> 272:2-20', + '2:20 -> 273:0', + '2:6 -> 275:0', + '2:20 -> 277:1', + '2:6 -> 279:0', + '2:6-20 -> 292:2-11', + '2:20 -> 293:0', + '2:6 -> 295:0', + '2:6-20 -> 296:2-11', + '2:6-20 -> 297:2-12', + '2:20 -> 298:0', + '2:6 -> 300:0', + '2:6-20 -> 301:2-12', + '2:20 -> 302:0', + '2:6 -> 304:0', + '2:6-20 -> 307:2-18', + '2:6-20 -> 308:2-11', + '2:6-20 -> 309:2-12', + '2:20 -> 310:0', + '2:6 -> 312:0', + '2:20 -> 314:1', + '2:6 -> 315:0', + '2:6-20 -> 316:2-12', + '2:20 -> 317:0', + '2:6 -> 319:0', + '2:20 -> 321:1', + '2:6 -> 323:0', + '2:6-20 -> 324:2-18', + '2:20 -> 325:0', + '2:6 -> 327:0', + '2:20 -> 330:1', + '2:6 -> 332:0', + '2:6-20 -> 334:2-20', + '2:6-20 -> 335:2-24', + '2:20 -> 336:0', + '2:6 -> 338:0', + '2:20 -> 340:1', + '2:6 -> 342:0', + '2:6-20 -> 344:2-17', + '2:20 -> 345:0', + '2:6 -> 347:0', + '2:20 -> 349:1', + '2:6 -> 350:0', + '2:6-20 -> 351:2-17', + '2:20 -> 352:0', + '2:6 -> 354:0', + '2:20 -> 358:1', + '2:6 -> 360:0', + '2:6-20 -> 368:2-24', + '2:6-20 -> 369:2-32', + '2:20 -> 370:0', + '2:6 -> 372:0', + '2:20 -> 374:1', + '2:6 -> 376:0', + '2:6-20 -> 378:2-17', + '2:6-20 -> 379:2-14', + '2:20 -> 380:0', + '2:6-20 -> 382:0-72', + '2:6 -> 383:0', + '2:6-20 -> 384:2-15', + '2:20 -> 385:0', + '2:6 -> 387:0', '2:6-20 -> 388:2-26', - '2:6-20 -> 389:2-21', + '2:6-20 -> 389:2-26', '2:6-20 -> 390:2-21', - '2:6-20 -> 391:2-16', + '2:6-20 -> 391:2-21', '2:6-20 -> 392:2-16', '2:6-20 -> 393:2-16', - '2:6-20 -> 394:2-17', + '2:6-20 -> 394:2-16', '2:6-20 -> 395:2-17', - '2:6-20 -> 396:2-15', + '2:6-20 -> 396:2-17', '2:6-20 -> 397:2-15', - '2:6-20 -> 398:2-20', - '2:6-20 -> 399:2-40', - '2:6-20 -> 400:2-32', - '2:6-20 -> 401:2-31', - '2:6-20 -> 402:2-30', - '2:6-20 -> 403:2-17', - '2:6-20 -> 404:2-22', - '2:6-20 -> 405:2-24', - '2:6-20 -> 406:2-25', - '2:6-20 -> 407:2-26', - '2:6-20 -> 408:2-20', - '2:6-20 -> 409:2-29', - '2:6-20 -> 410:2-30', - '2:6-20 -> 411:2-40', - '2:6-20 -> 412:2-36', - '2:6-20 -> 413:2-29', - '2:6-20 -> 414:2-24', - '2:6-20 -> 415:2-32', - '2:6-20 -> 416:2-14', - '2:6-20 -> 417:2-20', - '2:6-20 -> 418:2-18', - '2:6-20 -> 419:2-19', - '2:6-20 -> 420:2-20', - '2:6-20 -> 421:2-16', - '2:6-20 -> 422:2-18', - '2:6-20 -> 423:2-15', - '2:6-20 -> 424:2-21', - '2:6-20 -> 425:2-23', - '2:6-20 -> 426:2-29', - '2:6-20 -> 427:2-27', - '2:6-20 -> 428:2-28', - '2:6-20 -> 429:2-29', - '2:6-20 -> 430:2-25', - '2:6-20 -> 431:2-26', - '2:6-20 -> 432:2-27', - '2:6 -> 433:2', - '2:20 -> 434:0', - '2:6 -> 436:0', - '2:6-20 -> 437:2-26', + '2:6-20 -> 398:2-15', + '2:6-20 -> 399:2-20', + '2:6-20 -> 400:2-40', + '2:6-20 -> 401:2-32', + '2:6-20 -> 402:2-31', + '2:6-20 -> 403:2-30', + '2:6-20 -> 404:2-17', + '2:6-20 -> 405:2-22', + '2:6-20 -> 406:2-24', + '2:6-20 -> 407:2-25', + '2:6-20 -> 408:2-26', + '2:6-20 -> 409:2-20', + '2:6-20 -> 410:2-29', + '2:6-20 -> 411:2-30', + '2:6-20 -> 412:2-40', + '2:6-20 -> 413:2-36', + '2:6-20 -> 414:2-29', + '2:6-20 -> 415:2-24', + '2:6-20 -> 416:2-32', + '2:6-20 -> 417:2-14', + '2:6-20 -> 418:2-20', + '2:6-20 -> 419:2-18', + '2:6-20 -> 420:2-19', + '2:6-20 -> 421:2-20', + '2:6-20 -> 422:2-16', + '2:6-20 -> 423:2-18', + '2:6-20 -> 424:2-15', + '2:6-20 -> 425:2-21', + '2:6-20 -> 426:2-23', + '2:6-20 -> 427:2-29', + '2:6-20 -> 428:2-27', + '2:6-20 -> 429:2-28', + '2:6-20 -> 430:2-29', + '2:6-20 -> 431:2-25', + '2:6-20 -> 432:2-26', + '2:6-20 -> 433:2-27', + '2:6 -> 434:2', + '2:20 -> 435:0', + '2:6 -> 437:0', '2:6-20 -> 438:2-26', - '2:6-20 -> 439:2-21', + '2:6-20 -> 439:2-26', '2:6-20 -> 440:2-21', - '2:6-20 -> 441:2-16', + '2:6-20 -> 441:2-21', '2:6-20 -> 442:2-16', '2:6-20 -> 443:2-16', - '2:6-20 -> 444:2-17', + '2:6-20 -> 444:2-16', '2:6-20 -> 445:2-17', - '2:6-20 -> 446:2-15', + '2:6-20 -> 446:2-17', '2:6-20 -> 447:2-15', - '2:6-20 -> 448:2-20', - '2:6-20 -> 449:2-40', - '2:6-20 -> 450:2-32', - '2:6-20 -> 451:2-31', - '2:6-20 -> 452:2-30', - '2:6-20 -> 453:2-17', - '2:6-20 -> 454:2-22', - '2:6-20 -> 455:2-24', - '2:6-20 -> 456:2-25', - '2:6-20 -> 457:2-26', - '2:6-20 -> 458:2-20', - '2:6-20 -> 459:2-29', - '2:6-20 -> 460:2-30', - '2:6-20 -> 461:2-40', - '2:6-20 -> 462:2-36', - '2:6-20 -> 463:2-29', - '2:6-20 -> 464:2-24', - '2:6-20 -> 465:2-32', - '2:6-20 -> 466:2-14', - '2:6-20 -> 467:2-20', - '2:6-20 -> 468:2-18', - '2:6-20 -> 469:2-19', - '2:6-20 -> 470:2-20', - '2:6-20 -> 471:2-16', - '2:6-20 -> 472:2-18', - '2:6-20 -> 473:2-15', - '2:6-20 -> 474:2-21', - '2:6-20 -> 475:2-23', - '2:6-20 -> 476:2-29', - '2:6-20 -> 477:2-27', - '2:6-20 -> 478:2-28', - '2:6-20 -> 479:2-29', - '2:6-20 -> 480:2-25', - '2:6-20 -> 481:2-26', - '2:6-20 -> 482:2-27', - '2:6 -> 483:2', - '2:20 -> 484:0', + '2:6-20 -> 448:2-15', + '2:6-20 -> 449:2-20', + '2:6-20 -> 450:2-40', + '2:6-20 -> 451:2-32', + '2:6-20 -> 452:2-31', + '2:6-20 -> 453:2-30', + '2:6-20 -> 454:2-17', + '2:6-20 -> 455:2-22', + '2:6-20 -> 456:2-24', + '2:6-20 -> 457:2-25', + '2:6-20 -> 458:2-26', + '2:6-20 -> 459:2-20', + '2:6-20 -> 460:2-29', + '2:6-20 -> 461:2-30', + '2:6-20 -> 462:2-40', + '2:6-20 -> 463:2-36', + '2:6-20 -> 464:2-29', + '2:6-20 -> 465:2-24', + '2:6-20 -> 466:2-32', + '2:6-20 -> 467:2-14', + '2:6-20 -> 468:2-20', + '2:6-20 -> 469:2-18', + '2:6-20 -> 470:2-19', + '2:6-20 -> 471:2-20', + '2:6-20 -> 472:2-16', + '2:6-20 -> 473:2-18', + '2:6-20 -> 474:2-15', + '2:6-20 -> 475:2-21', + '2:6-20 -> 476:2-23', + '2:6-20 -> 477:2-29', + '2:6-20 -> 478:2-27', + '2:6-20 -> 479:2-28', + '2:6-20 -> 480:2-29', + '2:6-20 -> 481:2-25', + '2:6-20 -> 482:2-26', + '2:6-20 -> 483:2-27', + '2:6 -> 484:2', + '2:20 -> 485:0', ]) })