New e-* object structure in output

h-entry.html

@@ -117,7 +117,10 @@ <h3>The expected JSON output:</h3>
         "properties": {
             "url": ["http://microformats.org/2012/06/25/microformats-org-at-7"],
             "name": ["microformats.org at 7"],
-            "content": ["\n        &lt;p class=\"p-summary\"&gt;Last week the microformats.org community \n            celebrated its 7th birthday at a gathering hosted by Mozilla in \n            San Francisco and recognized accomplishments, challenges, and \n            opportunities.&lt;/p&gt;\n\n        &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n            forms the basis of many of our \n            &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n            in that regard, we&#8217;d like to recognize a few people and \n            thank them for their years of volunteer service &lt;/p&gt;\n    "],
+            "content": [{
+                "value": "Last week the microformats.org community celebrated its 7th birthday at a gathering hosted by Mozilla in San Francisco and recognized accomplishments, challenges, and opportunities. The microformats tagline “humans first, machines second” forms the basis of many of our principles, and in that regard, we’d like to recognize a few people and thank them for their years of volunteer service",
+                "html": "\n        &lt;p class=\"p-summary\"&gt;Last week the microformats.org community \n            celebrated its 7th birthday at a gathering hosted by Mozilla in \n            San Francisco and recognized accomplishments, challenges, and \n            opportunities.&lt;/p&gt;\n\n        &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n            forms the basis of many of our \n            &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n            in that regard, we&#8217;d like to recognize a few people and \n            thank them for their years of volunteer service &lt;/p&gt;\n    "
+            }],
             "updated": ["2012-06-25T17:08:26"], 
             "author": [{
                 "value": "Tantek",

h-news.html

@@ -71,7 +71,10 @@ <h3>The expected JSON output:</h3>
                 "properties": {
                     "name": ["microformats.org at 7"], 
                     "url": ["http://microformats.org/2012/06/25/microformats-org-at-7"], 
-                    "content": ["\n            &lt;p class=\"p-summary\"&gt;Last week the microformats.org community \n                celebrated its 7th birthday at a gathering hosted by Mozilla in \n                San Francisco and recognized accomplishments, challenges, and \n                opportunities.&lt;/p&gt;\n\n            &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n                forms the basis of many of our \n                &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n                in that regard, we&#8217;d like to recognize a few people and \n                thank them for their years of volunteer service &lt;/p&gt;\n        "],
+                    "content": [{
+                        "value": "Last week the microformats.org community celebrated its 7th birthday at a gathering hosted by Mozilla in San Francisco and recognized accomplishments, challenges, and opportunities. The microformats tagline “humans first, machines second” forms the basis of many of our principles, and in that regard, we’d like to recognize a few people and thank them for their years of volunteer service",
+                        "html": "\n            &lt;p class=\"p-summary\"&gt;Last week the microformats.org community \n                celebrated its 7th birthday at a gathering hosted by Mozilla in \n                San Francisco and recognized accomplishments, challenges, and \n                opportunities.&lt;/p&gt;\n\n            &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n                forms the basis of many of our \n                &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n                in that regard, we&#8217;d like to recognize a few people and \n                thank them for their years of volunteer service &lt;/p&gt;\n        "
+                    }],
                     "updated": ["2012-06-25T17:08:26"],
                     "author": {
                         "value": "Tantek",
@@ -157,7 +160,10 @@ <h3>The expected JSON output:</h3>
                 "properties": {
                     "name": ["microformats.org at 7"], 
                     "url": ["http://microformats.org/2012/06/25/microformats-org-at-7"], 
-                    "content": ["\n            &lt;p class=\"p-summary\"&gt;Last week the microformats.org community \n                celebrated its 7th birthday at a gathering hosted by Mozilla in \n                San Francisco and recognized accomplishments, challenges, and \n                opportunities.&lt;/p&gt;\n\n            &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n                forms the basis of many of our \n                &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n                in that regard, we&#8217;d like to recognize a few people and \n                thank them for their years of volunteer service &lt;/p&gt;\n        "], 
+                    "content": [{
+                        "value": "Last week the microformats.org community celebrated its 7th birthday at a gathering hosted by Mozilla in San Francisco and recognized accomplishments, challenges, and opportunities. The microformats tagline “humans first, machines second” forms the basis of many of our principles, and in that regard, we’d like to recognize a few people and thank them for their years of volunteer service",
+                        "html": "\n            &lt;p class=\"p-summary\"&gt;Last week the microformats.org community \n                celebrated its 7th birthday at a gathering hosted by Mozilla in \n                San Francisco and recognized accomplishments, challenges, and \n                opportunities.&lt;/p&gt;\n\n            &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n                forms the basis of many of our \n                &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n                in that regard, we&#8217;d like to recognize a few people and \n                thank them for their years of volunteer service &lt;/p&gt;\n        "
+                    }],
                     "summary": ["Last week the microformats.org community celebrated its 7th birthday at a gathering hosted by Mozilla in San Francisco and recognized accomplishments, challenges, and opportunities."],
                     "updated": ["2012-06-25T17:08:26"],
                     "author": {

h-product.html

@@ -106,7 +106,10 @@ <h3>The expected JSON output:</h3>
         "properties": {
             "name": ["Raspberry Pi"],
             "photo": ["http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/RaspberryPi.jpg/320px-RaspberryPi.jpg"],  
-            "description": ["The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It’s a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming."],
+            "description": [{
+                "value": "The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It’s a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming.",
+                "html": "The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It’s a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming."
+            }],
             "url": ["http://www.raspberrypi.org/"],
             "price": ["£29.95"],
             "category": ["Computer","Education"],
@@ -165,7 +168,10 @@ <h3>The expected JSON output:</h3>
         "properties": {
             "name": ["Raspberry Pi"],
             "photo": ["http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/RaspberryPi.jpg/320px-RaspberryPi.jpg"],  
-            "description": ["The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It’s a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming."],
+            "description": [{
+                "value": "The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It’s a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming.",
+                "html": "The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It’s a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming."
+            }],
             "url": ["http://www.raspberrypi.org/"],
             "price": ["£29.95"],
             "review": [{

h-recipe.html

@@ -47,7 +47,13 @@ <h3>The expected JSON output:</h3>
         "type": ["h-recipe"],
         "properties": {
             "name": ["Toast"],
-            "ingredient": ["Slice of bread", "Butter"]
+            "ingredient": [{
+                    "value": "Slice of bread",
+                    "html": "Slice of bread"
+                },{
+                    "value": "Butter",
+                    "html": "Butter"
+            }]
         }
     }]
 }
@@ -150,16 +156,26 @@ <h3>The expected JSON output:</h3>
                     }
                 }
             ],
-            "ingredient": [
-                "1 egg",
-                "75g plain flour",
-                "70ml milk",
-                "60ml water",
-                "Pinch of salt"
-            ],
-            "instructions": [
-                "\n        <ol>\n            <li>Pre-heat oven to 230C or gas mark 8. Pour the vegetable oil evenly into 2 x 4-hole \n            Yorkshire pudding tins and place in the oven to heat through.</li> \n            \n            <li>To make the batter, add all the flour into a bowl and beat in the eggs until smooth. \n            Gradually add the milk and water while beating the mixture. It should be smooth and \n            without lumps. Finally add a pinch of salt.</li>\n            \n            <li>Make sure the oil is piping hot before pouring the batter evenly into the tins. \n            Place in the oven for 20-25 minutes until pudding have risen and look golden brown</li>\n        </ol>\n    "
-            ],
+            "ingredient": [{
+                    "value": "1 egg",
+                    "html": "1 egg"
+                },{
+                    "value": "75g plain flour",
+                    "html": "75g plain flour"
+                },{
+                    "value": "70ml milk",
+                    "html": "70ml milk"
+                },{
+                    "value": "60ml water",
+                    "html": "60ml water"
+                },{
+                    "value": "Pinch of salt",
+                    "html": "Pinch of salt"
+            }],
+            "instructions": [{
+                "value": "Pre-heat oven to 230C or gas mark 8. Pour the vegetable oil evenly into 2 x 4-hole Yorkshire pudding tins and place in the oven to heat through. To make the batter, add all the flour into a bowl and beat in the eggs until smooth. Gradually add the milk and water while beating the mixture. It should be smooth and without lumps. Finally add a pinch of salt. Make sure the oil is piping hot before pouring the batter evenly into the tins. Place in the oven for 20-25 minutes until pudding have risen and look golden brown",
+                "html": "\n        <ol>\n            <li>Pre-heat oven to 230C or gas mark 8. Pour the vegetable oil evenly into 2 x 4-hole \n            Yorkshire pudding tins and place in the oven to heat through.</li> \n            \n            <li>To make the batter, add all the flour into a bowl and beat in the eggs until smooth. \n            Gradually add the milk and water while beating the mixture. It should be smooth and \n            without lumps. Finally add a pinch of salt.</li>\n            \n            <li>Make sure the oil is piping hot before pouring the batter evenly into the tins. \n            Place in the oven for 20-25 minutes until pudding have risen and look golden brown</li>\n        </ol>\n    "
+            }],
             "nutrition": [
                 "Calories: 125",
                 "Fat: 3.2g",

h-review.html

@@ -233,7 +233,10 @@ <h3>The expected JSON output:</h3>
                     "name": ["Tantek"]
                 }
             }],
-            "description": ["\n        &lt;p class=\"p-item h-card\"&gt;\n        &lt;span class=\"p-name p-org\"&gt;Crepes on Cole&lt;/span&gt; is one of the best little \n        creperies in &lt;span class=\"p-adr h-adr\"&gt;&lt;span class=\"p-locality\"&gt;San Francisco&lt;/span&gt;&lt;/span&gt;.\n        Excellent food and service. Plenty of tables in a variety of sizes \n        for parties large and small.  Window seating makes for excellent \n        people watching to/from the N-Judah which stops right outside.  \n        I've had many fun social gatherings here, as well as gotten \n        plenty of work done thanks to neighborhood WiFi.\n        &lt;/p&gt;\n    "],
+            "description": [{
+                "value": "Crepes on Cole is one of the best little creperies in San Francisco. Excellent food and service. Plenty of tables in a variety of sizes for parties large and small. Window seating makes for excellent people watching to/from the N-Judah which stops right outside. I've had many fun social gatherings here, as well as gotten plenty of work done thanks to neighborhood WiFi.",
+                "html": "\n        &lt;p class=\"p-item h-card\"&gt;\n        &lt;span class=\"p-name p-org\"&gt;Crepes on Cole&lt;/span&gt; is one of the best little \n        creperies in &lt;span class=\"p-adr h-adr\"&gt;&lt;span class=\"p-locality\"&gt;San Francisco&lt;/span&gt;&lt;/span&gt;.\n        Excellent food and service. Plenty of tables in a variety of sizes \n        for parties large and small.  Window seating makes for excellent \n        people watching to/from the N-Judah which stops right outside.  \n        I've had many fun social gatherings here, as well as gotten \n        plenty of work done thanks to neighborhood WiFi.\n        &lt;/p&gt;\n    "
+            }],
             "item": [{
                 "value": "Crepes on Cole is one of the best little creperies in San Francisco. Excellent food and service. Plenty of tables in a variety of sizes for parties large and small. Window seating makes for excellent people watching to/from the N-Judah which stops right outside. I've had many fun social gatherings here, as well as gotten plenty of work done thanks to neighborhood WiFi.",
                 "type": ["h-card"],

hentry.html

@@ -116,7 +116,10 @@ <h3>The expected JSON output:</h3>
         "type": ["h-entry"],
         "properties": {
             "name": ["microformats.org at 7"],
-            "content": ["\n        &lt;p class=\"entry-summary\"&gt;Last week the microformats.org community \n            celebrated its 7th birthday at a gathering hosted by Mozilla in \n            San Francisco and recognized accomplishments, challenges, and \n            opportunities.&lt;/p&gt;\n\n        &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n            forms the basis of many of our \n            &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n            in that regard, we&#8217;d like to recognize a few people and \n            thank them for their years of volunteer service &lt;/p&gt;\n    "], 
+            "content": [{
+                "value": "Last week the microformats.org community celebrated its 7th birthday at a gathering hosted by Mozilla in San Francisco and recognized accomplishments, challenges, and opportunities. The microformats tagline “humans first, machines second” forms the basis of many of our principles, and in that regard, we’d like to recognize a few people and thank them for their years of volunteer service",
+                "html": "\n        &lt;p class=\"entry-summary\"&gt;Last week the microformats.org community \n            celebrated its 7th birthday at a gathering hosted by Mozilla in \n            San Francisco and recognized accomplishments, challenges, and \n            opportunities.&lt;/p&gt;\n\n        &lt;p&gt;The microformats tagline &#8220;humans first, machines second&#8221; \n            forms the basis of many of our \n            &lt;a href=\"http://microformats.org/wiki/principles\"&gt;principles&lt;/a&gt;, and \n            in that regard, we&#8217;d like to recognize a few people and \n            thank them for their years of volunteer service &lt;/p&gt;\n    "
+            }], 
             "summary": ["Last week the microformats.org community celebrated its 7th birthday at a gathering hosted by Mozilla in San Francisco and recognized accomplishments, challenges, and opportunities."],
             "updated": ["2012-06-25T17:08:26"], 
             "author": [{