Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v5.0.2 #1529

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/build/update-validator-schemas.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ git fetch $UPSTREAM

## Create patches since last update (to the `latest` tag)
echo "Creating paches of changes since the last update"
git format-patch -o $EPUBCHECK_DIR $LAST_SHA1..latest schema
git format-patch -o $EPUBCHECK_DIR/ $LAST_SHA1..latest schema

## Get the SHA-1 of the `latest` tag
LATEST=`git rev-list -n 1 latest`
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/adobe/epubcheck/css/CSSHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ else if (propertyName.equals("src"))
URL fontURL = parsedURLs.get(((CssURI) construct).toUriString());
if (fontURL != null && context.resourceRegistry.isPresent())
{
fontURI = context.relativize(fontURL);
// check font mimetypes
String fontMimeType = context.getMimeType(fontURL);
if (fontMimeType != null)
Expand Down
293 changes: 275 additions & 18 deletions src/main/java/com/adobe/epubcheck/opf/OPFHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

public class OPFHandler extends XMLHandler
{

protected static final String TEXT = "text";

protected String pageMapId = null;
Expand Down Expand Up @@ -95,23 +95,280 @@ public class OPFHandler extends XMLHandler

static
{
String[] list = { "acp", "act", "adp", "aft", "anl", "anm", "ann", "ant", "app", "aqt", "arc",
"ard", "arr", "art", "asg", "asn", "att", "auc", "aud", "aui", "aus", "aut", "bdd", "bjd",
"bkd", "bkp", "bnd", "bpd", "bsl", "ccp", "chr", "clb", "cli", "cll", "clr", "clt", "cmm",
"cmp", "cmt", "cng", "cnd", "cns", "coe", "col", "com", "cos", "cot", "cov", "cpc", "cpe",
"cph", "cpl", "cpt", "cre", "crp", "crr", "csl", "csp", "cst", "ctb", "cte", "ctg", "ctr",
"cts", "ctt", "cur", "cwt", "dfd", "dfe", "dft", "dgg", "dis", "dln", "dnc", "dnr", "dpc",
"dpt", "drm", "drt", "dsr", "dst", "dtc", "dte", "dtm", "dto", "dub", "edt", "egr", "elg",
"elt", "eng", "etr", "exp", "fac", "fld", "flm", "fmo", "fpy", "fnd", "frg", "gis", "grt",
"hnr", "hst", "ill", "ilu", "ins", "inv", "itr", "ive", "ivr", "lbr", "lbt", "ldr", "led",
"lee", "lel", "len", "let", "lgd", "lie", "lil", "lit", "lsa", "lse", "lso", "ltg", "lyr",
"mcp", "mfr", "mdc", "mod", "mon", "mrk", "msd", "mte", "mus", "nrt", "opn", "org", "orm",
"oth", "own", "pat", "pbd", "pbl", "pdr", "pfr", "pht", "plt", "pma", "pmn", "pop", "ppm",
"ppt", "prc", "prd", "prf", "prg", "prm", "pro", "prt", "pta", "pte", "ptf", "pth", "ptt",
"rbr", "rce", "rcp", "red", "ren", "res", "rev", "rps", "rpt", "rpy", "rse", "rsg", "rsp",
"rst", "rth", "rtm", "sad", "sce", "scl", "scr", "sds", "sec", "sgn", "sht", "sng", "spk",
"spn", "spy", "srv", "std", "stl", "stm", "stn", "str", "tcd", "tch", "ths", "trc", "trl",
"tyd", "tyg", "vdg", "voc", "wam", "wdc", "wde", "wit" };
String[] list = {
"abr",
"acp",
"act",
"adi",
"adp",
"aft",
"anl",
"anm",
"ann",
"ant",
"ape",
"apl",
"app",
"aqt",
"arc",
"ard",
"arr",
"art",
"asg",
"asn",
"ato",
"att",
"auc",
"aud",
"aui",
"aus",
"aut",
"bdd",
"bjd",
"bkd",
"bkp",
"blw",
"bnd",
"bpd",
"brd",
"brl",
"bsl",
"cas",
"ccp",
"chr",
"clb",
"cli",
"cll",
"clr",
"clt",
"cmm",
"cmp",
"cmt",
"cnd",
"cng",
"cns",
"coe",
"col",
"com",
"con",
"cor",
"cos",
"cot",
"cou",
"cov",
"cpc",
"cpe",
"cph",
"cpl",
"cpt",
"cre",
"crp",
"crr",
"crt",
"csl",
"csp",
"cst",
"ctb",
"cte",
"ctg",
"ctr",
"cts",
"ctt",
"cur",
"cwt",
"dbp",
"dfd",
"dfe",
"dft",
"dgc",
"dgg",
"dgs",
"dis",
"dln",
"dnc",
"dnr",
"dpc",
"dpt",
"drm",
"drt",
"dsr",
"dst",
"dtc",
"dte",
"dtm",
"dto",
"dub",
"edc",
"edm",
"edt",
"egr",
"elg",
"elt",
"eng",
"enj",
"etr",
"evp",
"exp",
"fac",
"fds",
"fld",
"flm",
"fmd",
"fmk",
"fmo",
"fmp",
"fnd",
"fpy",
"frg",
"gis",
"grt",
"his",
"hnr",
"hst",
"ill",
"ilu",
"ins",
"inv",
"isb",
"itr",
"ive",
"ivr",
"jud",
"jug",
"lbr",
"lbt",
"ldr",
"led",
"lee",
"lel",
"len",
"let",
"lgd",
"lie",
"lil",
"lit",
"lsa",
"lse",
"lso",
"ltg",
"lyr",
"mcp",
"mdc",
"med",
"mfp",
"mfr",
"mod",
"mon",
"mrb",
"mrk",
"msd",
"mte",
"mtk",
"mus",
"nrt",
"opn",
"org",
"orm",
"osp",
"oth",
"own",
"pad",
"pan",
"pat",
"pbd",
"pbl",
"pdr",
"pfr",
"pht",
"plt",
"pma",
"pmn",
"pop",
"ppm",
"ppt",
"pra",
"prc",
"prd",
"pre",
"prf",
"prg",
"prm",
"prn",
"pro",
"prp",
"prs",
"prt",
"prv",
"pta",
"pte",
"ptf",
"pth",
"ptt",
"pup",
"rbr",
"rcd",
"rce",
"rcp",
"rdd",
"red",
"ren",
"res",
"rev",
"rpc",
"rps",
"rpt",
"rpy",
"rse",
"rsg",
"rsp",
"rsr",
"rst",
"rth",
"rtm",
"sad",
"sce",
"scl",
"scr",
"sds",
"sec",
"sgd",
"sgn",
"sht",
"sll",
"sng",
"spk",
"spn",
"spy",
"srv",
"std",
"stg",
"stl",
"stm",
"stn",
"str",
"tcd",
"tch",
"ths",
"tld",
"tlp",
"trc",
"trl",
"tyd",
"tyg",
"uvp",
"vac",
"vdg",
"voc",
"wac",
"wal",
"wam",
"wat",
"wdc",
"wde",
"win",
"wit",
"wpr",
"wst" };
Collections.addAll(validRoles, list);
}

Expand Down
Loading