From 48f7bdba001f977c970d53c0a780f3e2aee10ff4 Mon Sep 17 00:00:00 2001 From: Boris Schneiderman Date: Wed, 23 Apr 2014 15:36:53 -0700 Subject: [PATCH 1/2] added support for non preffixed page-spread-.. propertiesadded support for non preffixed page-spread-.. properties --- LauncherOSX/LOXSpineItem.mm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/LauncherOSX/LOXSpineItem.mm b/LauncherOSX/LOXSpineItem.mm index 48a6bff..71a8909 100644 --- a/LauncherOSX/LOXSpineItem.mm +++ b/LauncherOSX/LOXSpineItem.mm @@ -52,34 +52,40 @@ - (id)initWithSdkSpineItem:(ePub3::SpineItemPtr)sdkSpineItem fromPackage:(LOXPac auto manifestItem = sdkSpineItem->ManifestItem(); _href = [NSString stringWithUTF8String:manifestItem->BaseHref().c_str()]; - + _media_type = [NSString stringWithUTF8String:manifestItem->MediaType().c_str()]; - + _media_overlay_id = [[NSString alloc] initWithUTF8String: manifestItem->MediaOverlayID().c_str()]; - + _idref = [NSString stringWithUTF8String:str]; _sdkSpineItem = sdkSpineItem; - _page_spread = [self findProperty:@"page-spread-left" withPrefix:@"rendition"]; - if([_page_spread length] == 0) { - _page_spread = [self findProperty:@"page-spread-right" withPrefix:@"rendition"]; - if([_page_spread length] == 0) { - _page_spread = [self findProperty:@"page-spread-center" withPrefix:@"rendition"]; - } - } + _page_spread = [self findProperty:@"page-spread" withOptionalPrefix:@"rendition"]; _rendition_spread = [self findProperty:@"spread" withPrefix:@"rendition"]; _rendition_layout = [self findProperty:@"layout" withPrefix:@"rendition"]; _rendition_flow = [self findProperty:@"flow" withPrefix:@"rendition"]; - + } return self; } +- (NSString *) findProperty:(NSString *)propName withOptionalPrefix:(NSString *)prefix +{ + NSString* value = [self findProperty:propName withPrefix:prefix]; + + if([value length] == 0) { + value = [self findProperty:propName withPrefix:@""]; + } + + return value; + +} + - (NSString *) findProperty:(NSString *)propName withPrefix:(NSString *)prefix { auto prop = _sdkSpineItem->PropertyMatching([propName UTF8String], [prefix UTF8String]); From aabda38e6640593a53680af0e22b014c4df96348 Mon Sep 17 00:00:00 2001 From: Boris Schneiderman Date: Wed, 23 Apr 2014 15:37:34 -0700 Subject: [PATCH 2/2] added support for non preffixed page-spread-.. --- readium-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium-sdk b/readium-sdk index c72a875..2f66f08 160000 --- a/readium-sdk +++ b/readium-sdk @@ -1 +1 @@ -Subproject commit c72a875ea4e514201a17a5a9c86cbd0cf42090a2 +Subproject commit 2f66f0875ecbfa4052829030d758cd4296e84854