Solidify margin workaround, update tests

1 files changed, 37 insertions, 37 deletions

diff --git a/tests/html/bbcnewsleaks.html.simple b/tests/html/bbcnewsleaks.html.simple
index 4b6043e..25b887e 100644
--- a/tests/html/bbcnewsleaks.html.simple
+++ b/tests/html/bbcnewsleaks.html.simple
@@ -166,9 +166,9 @@ $render("page-bookmark-links","page-bookmark-links-head",{
     <span>Some suspected insurgents held in Iraqi custody suffered abuse, according to the leaked records</span>
   </div>
                       <p class="introduction">Wikileaks has released almost 400,000 secret US military logs, which suggest US commanders ignored evidence of torture by the Iraqi authorities.  </p>
-        <p>The documents also suggest "hundreds" of civilians were killed at US military checkpoints after the invasion in 2003.</p>
-        <p>And the files show the US kept records of civilian deaths, despite previously denying it. The death toll was put at 109,000, of whom 66,081 were civilians.</p>
-        <p>The US criticised the largest leak of classified documents in its history.</p>
+        <p style="margin:1em 0em">The documents also suggest "hundreds" of civilians were killed at US military checkpoints after the invasion in 2003.</p>
+        <p style="margin:1em 0em">And the files show the US kept records of civilian deaths, despite previously denying it. The death toll was put at 109,000, of whom 66,081 were civilians.</p>
+        <p style="margin:1em 0em">The US criticised the largest leak of classified documents in its history.</p>
   	<div class="story-feature related narrow">
 		Continue reading the main story		<h2>Related stories</h2>
 		<ul class="related-links-list">
@@ -178,16 +178,16 @@ $render("page-bookmark-links","page-bookmark-links-head",{
 																	</ul>
 	</div>
       <p id="story_continues_1">A US Department of Defense spokesman dismissed the documents published by the whistleblowing website as raw observations by tactical units, which were only snapshots of tragic, mundane events. </p>
-        <p>On allegations of abuse, he said it was policy always to report "potentially illegal abusive behaviour" so action could be taken.</p>
-        <p>At a news conference in London, Wikileaks founder Julian Assange said that those snapshots of everyday events offered a glimpse at the "human scale" of the conflict.</p>
-        <p>The deaths of one or two individuals made up the "overwhelming number" of people killed in Iraq, Mr Assange said. </p>
-        <p>The new documents and new deaths contained within them showed the range and frequency of the "small, relentless tragedies of this war" added John Sloboda of Iraq Body Count, which worked with Wikileaks.</p>
-        <p>Speaking to reporters in Washington on Friday, US Secretary of State Hillary Clinton said she condemned the disclosure and suggested the leaks put lives at risk.</p>
-        <p>However, Wikileaks said it was confident that the documents - published in a heavily censored form - contain "no information that could be harmful to any individual".</p>
-        <p>Wikileaks says it expects to launch legal proceedings as a result of information contained in the documents.</p>
-        <p><strong>'Nothing new'</strong></p>
-        <p>The 391,831 US army Sigacts (Significant Actions) reports published by Wikileaks on Friday describe the apparent torture of Iraqi detainees by the Iraqi authorities, sometimes using electrocution, electric drills and in some cases even executing detainees, says the BBC's Adam Brookes, who has examined some of the files.</p>
-        <p>The US military knew of the abuses, the documents suggest, but reports were sent up the chain of command marked "no further investigation", our correspondent adds.</p>
+        <p style="margin:1em 0em">On allegations of abuse, he said it was policy always to report "potentially illegal abusive behaviour" so action could be taken.</p>
+        <p style="margin:1em 0em">At a news conference in London, Wikileaks founder Julian Assange said that those snapshots of everyday events offered a glimpse at the "human scale" of the conflict.</p>
+        <p style="margin:1em 0em">The deaths of one or two individuals made up the "overwhelming number" of people killed in Iraq, Mr Assange said. </p>
+        <p style="margin:1em 0em">The new documents and new deaths contained within them showed the range and frequency of the "small, relentless tragedies of this war" added John Sloboda of Iraq Body Count, which worked with Wikileaks.</p>
+        <p style="margin:1em 0em">Speaking to reporters in Washington on Friday, US Secretary of State Hillary Clinton said she condemned the disclosure and suggested the leaks put lives at risk.</p>
+        <p style="margin:1em 0em">However, Wikileaks said it was confident that the documents - published in a heavily censored form - contain "no information that could be harmful to any individual".</p>
+        <p style="margin:1em 0em">Wikileaks says it expects to launch legal proceedings as a result of information contained in the documents.</p>
+        <p style="margin:1em 0em"><strong>'Nothing new'</strong></p>
+        <p style="margin:1em 0em">The 391,831 US army Sigacts (Significant Actions) reports published by Wikileaks on Friday describe the apparent torture of Iraqi detainees by the Iraqi authorities, sometimes using electrocution, electric drills and in some cases even executing detainees, says the BBC's Adam Brookes, who has examined some of the files.</p>
+        <p style="margin:1em 0em">The US military knew of the abuses, the documents suggest, but reports were sent up the chain of command marked "no further investigation", our correspondent adds.</p>
   <div class="story-feature wide ">
 	Continue reading the main story		<h2>Analysis</h2>
 		<!-- pullout-items-->
@@ -198,23 +198,23 @@ $render("page-bookmark-links","page-bookmark-links-head",{
 	<hr>
 </div>
 	<!-- pullout-body-->
-	      <p>The documents number in the hundreds of thousands. They take the form of reports written by soldiers after vicious firefights with insurgents, or after a roadside bomb has gone off, or the bodies of a family have been found murdered in an abandoned factory. Their language is military - hard and attenuated. </p>
-        <p>We found, with relative ease, reports of horrible abuse committed by Iraqi security forces on detainees - beatings, electrocution, the use of an electric drill on a man's legs. The Americans were aware the abuse had taken place. On some, not all, of these reports was marked "no further investigation", suggesting that American forces took no action on learning of the abuse. </p>
-        <p>The true lessons contained in these documents will take months or years to emerge. But an early question they pose is: why do Iraqi security forces appear to be continuing practices that might have died with the fall of Saddam Hussein's regime? And what has the United States done to end them?</p>
+	      <p style="margin:1em 0em">The documents number in the hundreds of thousands. They take the form of reports written by soldiers after vicious firefights with insurgents, or after a roadside bomb has gone off, or the bodies of a family have been found murdered in an abandoned factory. Their language is military - hard and attenuated. </p>
+        <p style="margin:1em 0em">We found, with relative ease, reports of horrible abuse committed by Iraqi security forces on detainees - beatings, electrocution, the use of an electric drill on a man's legs. The Americans were aware the abuse had taken place. On some, not all, of these reports was marked "no further investigation", suggesting that American forces took no action on learning of the abuse. </p>
+        <p style="margin:1em 0em">The true lessons contained in these documents will take months or years to emerge. But an early question they pose is: why do Iraqi security forces appear to be continuing practices that might have died with the fall of Saddam Hussein's regime? And what has the United States done to end them?</p>
   
 	<!-- pullout-links-->
 	</div>      <p id="story_continues_2">One document shows the US military was given a video apparently showing Iraqi Army (IA) officers executing a prisoner in the northern town of Talafar.</p>
-        <p>"The footage shows the IA soldiers moving the detainee into the street, pushing him to the ground, punching him and shooting him," states the log, which also names at least one of the perpetrators.</p>
-        <p>In another case, US soldiers suspected army officers of cutting off a detainee's fingers and burning him with acid. </p>
-        <p>Pentagon spokesman Geoff Morrell told the BBC that if abuse by the Iraqi security forces was witnessed, or reports of it were received, US military personnel were instructed to inform their commanders.</p>
-        <p>"And at the appropriate level that information would then be shared with the Iraqi authorities and the military for them to take action."</p>
-        <p>The documents also reveal many previously unreported instances in which US forces killed civilians at checkpoints and during operations.</p>
-        <p>In one incident in July 2007, as many as 26 Iraqis were killed by a helicopter, about half of them civilians, according to the log.</p>
-        <p>Another record shows an Apache helicopter gunship fired on two men believed to have fired mortars at a military base in Baghdad in February 2007, even though they were attempting to surrender. The crew asked a lawyer whether they could accept the surrender, but were told they could not, "and are still valid targets". So they shot them.</p>
-        <p>The helicopter - with the callsign "Crazyhorse 18" - was also involved in another incident that July in which two journalists were killed and two children wounded.</p>
-        <p>There are also new indications of Iran's involvement in Iraq, with reports of insurgents being trained and using weapons provided by the Islamic Revolution Guards Corps (IRGC).</p>
-        <p>Finally, the documents appear to show that the US military did keep records of civilian deaths, despite earlier denials that any official statistics on the death toll were available.</p>
-        <p>The logs showed there were more than 109,000 violent deaths between 2004 and the end of 2009.</p>
+        <p style="margin:1em 0em">"The footage shows the IA soldiers moving the detainee into the street, pushing him to the ground, punching him and shooting him," states the log, which also names at least one of the perpetrators.</p>
+        <p style="margin:1em 0em">In another case, US soldiers suspected army officers of cutting off a detainee's fingers and burning him with acid. </p>
+        <p style="margin:1em 0em">Pentagon spokesman Geoff Morrell told the BBC that if abuse by the Iraqi security forces was witnessed, or reports of it were received, US military personnel were instructed to inform their commanders.</p>
+        <p style="margin:1em 0em">"And at the appropriate level that information would then be shared with the Iraqi authorities and the military for them to take action."</p>
+        <p style="margin:1em 0em">The documents also reveal many previously unreported instances in which US forces killed civilians at checkpoints and during operations.</p>
+        <p style="margin:1em 0em">In one incident in July 2007, as many as 26 Iraqis were killed by a helicopter, about half of them civilians, according to the log.</p>
+        <p style="margin:1em 0em">Another record shows an Apache helicopter gunship fired on two men believed to have fired mortars at a military base in Baghdad in February 2007, even though they were attempting to surrender. The crew asked a lawyer whether they could accept the surrender, but were told they could not, "and are still valid targets". So they shot them.</p>
+        <p style="margin:1em 0em">The helicopter - with the callsign "Crazyhorse 18" - was also involved in another incident that July in which two journalists were killed and two children wounded.</p>
+        <p style="margin:1em 0em">There are also new indications of Iran's involvement in Iraq, with reports of insurgents being trained and using weapons provided by the Islamic Revolution Guards Corps (IRGC).</p>
+        <p style="margin:1em 0em">Finally, the documents appear to show that the US military did keep records of civilian deaths, despite earlier denials that any official statistics on the death toll were available.</p>
+        <p style="margin:1em 0em">The logs showed there were more than 109,000 violent deaths between 2004 and the end of 2009.</p>
   <!--  Embedding the video player -->
 <!--  This is the embedded player component -->
 
@@ -285,11 +285,11 @@ $render("page-bookmark-links","page-bookmark-links-head",{
         </div>
 <!-- end of the embedded player component -->
 
-<!-- Player embedded -->      <p>They included 66,081 civilians, 23,984 people classed as "enemy", 15,196 members of the Iraqi security forces, and 3,771 coalition troops.</p>
-        <p>Iraq Body Count, which collates civilian deaths using cross-checked media reports and other figures such as morgue records, said that based on an analysis of a sample of 860 logs, it estimated that around 15,000 previously unknown civilian deaths would be identified.</p>
-        <p>The UK's Guardian newspaper also reported that the US military appeared not to have recorded any civilian deaths during its two major offensives on the city of Falluja in 2004.</p>
-        <p>Mr Morrell, of the Pentagon, told the BBC that the leak was a "travesty" which provided enemies of the West with an "extraordinary database to figure out how we operate".</p>
-        <p>He said the cache of documents contained "nothing new" with regards to fundamental policy issues.</p>
+<!-- Player embedded -->      <p style="margin:1em 0em">They included 66,081 civilians, 23,984 people classed as "enemy", 15,196 members of the Iraqi security forces, and 3,771 coalition troops.</p>
+        <p style="margin:1em 0em">Iraq Body Count, which collates civilian deaths using cross-checked media reports and other figures such as morgue records, said that based on an analysis of a sample of 860 logs, it estimated that around 15,000 previously unknown civilian deaths would be identified.</p>
+        <p style="margin:1em 0em">The UK's Guardian newspaper also reported that the US military appeared not to have recorded any civilian deaths during its two major offensives on the city of Falluja in 2004.</p>
+        <p style="margin:1em 0em">Mr Morrell, of the Pentagon, told the BBC that the leak was a "travesty" which provided enemies of the West with an "extraordinary database to figure out how we operate".</p>
+        <p style="margin:1em 0em">He said the cache of documents contained "nothing new" with regards to fundamental policy issues.</p>
   <!--  Embedding the audio player -->
 <!--  This is the embedded player component -->
 
@@ -343,11 +343,11 @@ $render("page-bookmark-links","page-bookmark-links-head",{
             </div>
 <!-- end of the embedded player component -->
 
-<!-- Player embedded -->      <p>And he once again asked Wikileaks to remove the documents from the web and return them to the Department of Defense.</p>
-        <p>US Defence Secretary Robert Gates suggested the whistle-blowing website had blood on its hands in July after it published more than 70,000 secret papers about the war in Afghanistan. </p>
-        <p>The investigation into the Afghan leak has focused on Bradley Manning, a US army intelligence analyst who is in custody and has been charged with providing Wikileaks with a video of the July 2007 attack by a helicopter with the callsign Crazyhorse 18.</p>
-        <p>The release of the documents comes as the US military prepares to withdraw all 50,000 remaining troops from Iraq by the end of 2011. </p>
-        <p>Violence in the country has declined sharply over the past two years, but near-daily bombings and shootings continue.</p>
+<!-- Player embedded -->      <p style="margin:1em 0em">And he once again asked Wikileaks to remove the documents from the web and return them to the Department of Defense.</p>
+        <p style="margin:1em 0em">US Defence Secretary Robert Gates suggested the whistle-blowing website had blood on its hands in July after it published more than 70,000 secret papers about the war in Afghanistan. </p>
+        <p style="margin:1em 0em">The investigation into the Afghan leak has focused on Bradley Manning, a US army intelligence analyst who is in custody and has been charged with providing Wikileaks with a video of the July 2007 attack by a helicopter with the callsign Crazyhorse 18.</p>
+        <p style="margin:1em 0em">The release of the documents comes as the US military prepares to withdraw all 50,000 remaining troops from Iraq by the end of 2011. </p>
+        <p style="margin:1em 0em">Violence in the country has declined sharply over the past two years, but near-daily bombings and shootings continue.</p>
              
 	
 	</div>