Merge pull request #23 from M2Mobi/feature/OptimizeInlineImage

Optimisation of inline images

Example/Podfile

@@ -11,3 +11,11 @@ target 'markymark_Tests' do
 
     pod 'markymark', :path => '../'
 end
+
+post_install do |installer|
+    installer.pods_project.targets.each do |target|
+        target.build_configurations.each do |config|
+            config.build_settings['SWIFT_VERSION'] = '2.3'
+        end
+    end
+end

Example/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - markymark (1.0.0)
+  - markymark (2.0.2)
 
 DEPENDENCIES:
   - markymark (from `../`)
 
 EXTERNAL SOURCES:
   markymark:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  markymark: 98e5f546d669b72a9a0421132435bda772f05a68
+  markymark: 006ec2919f379d17ebfaafdde6b0ef11da40c9d7
 
-PODFILE CHECKSUM: 481cd97f67bbaaac4fbd503a35c4acb0fe69c1cc
+PODFILE CHECKSUM: 19868940cb8798c2b34d2d5eb7bf65010c394bc0
 
-COCOAPODS: 1.1.0.rc.2
+COCOAPODS: 1.0.1

Example/markymark.xcodeproj/project.pbxproj

@@ -412,7 +412,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		029A2E5D6800056D702BE822 /* [CP] Embed Pods Frameworks */ = {
@@ -472,7 +472,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		F220BF3FD9625FD67595F183 /* [CP] Embed Pods Frameworks */ = {
@@ -609,6 +609,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -649,6 +650,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

Example/markymark/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -35,4 +45,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

Example/markymark/Images.xcassets/appleLogo.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appleLogo.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/markymark/Images.xcassets/appleLogoSmall.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appleLogoSmall.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/markymark/markdown.txt

@@ -51,6 +51,8 @@ c. Number 3
 ---
 ![My Apple](http://images.apple.com/apple-events/static/apple-events/october-2013/video/poster_large.jpg)
 
+Inline image ![Apple logo](appleLogo) Apple logo ![Apple logo](appleLogoSmall)
+
 # Paragraphs
 Lorem ipsum *dolor* sit amet, __consectetur__ adipiscing elit. Proin ***aliquet vulputate*** diam. Duis sodales ~~sapien~~ quis ***elementum* posuere**. Duis quam lectus, posueresed  [~~pellentesqueaauctor~~](https://m2mobi.com) eu [Velit](https://m2mobi.com).
 ---
@@ -71,4 +73,4 @@ On *multiple* lines
 
 ``` @Override ```
 
-Or maybe in line `@Override`
+Or maybe in line `@Override`

markymark.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "markymark"
-  s.version          = "2.0.1"
+  s.version          = "2.0.2"
   s.summary          = "Markdown parser for iOS"
   s.description      = <<-DESC
 Marky Mark is a parser written in Swift that converts markdown into native views. The way it looks is highly customizable and the supported markdown syntax and tags are easy to extend.
@@ -15,4 +15,4 @@ Marky Mark is a parser written in Swift that converts markdown into native views
 
 s.source_files = 'markymark/Classes/**/*{.swift}'
 
-end
+end

markymark/Classes/Layout Builders/AttributedString/Block Builders/Inline/TextAttachment.swift

@@ -10,17 +10,23 @@ import Foundation
 import UIKit
 
 class TextAttachment: NSTextAttachment {
-    
+
     override func attachmentBoundsForTextContainer(textContainer: NSTextContainer?, proposedLineFragment lineFrag: CGRect, glyphPosition position: CGPoint, characterIndex charIndex: Int) -> CGRect {
-        
+
         var imageSize = CGSize()
-        
+
         let originalImageSize = image?.size ?? CGSize()
         let imageRatio = originalImageSize.height / originalImageSize.width
-
-        imageSize.width = lineFrag.width
-        imageSize.height = imageSize.width * imageRatio
-
+
+        let desiredWidth = originalImageSize.height/imageRatio
+        if desiredWidth > lineFrag.width {
+            imageSize.width = lineFrag.width
+            imageSize.height = imageSize.width * imageRatio
+        } else {
+            imageSize.height = originalImageSize.height
+            imageSize.width = desiredWidth
+        }
+
         return CGRect(origin: CGPoint(), size: imageSize)
     }
 }