diff --git a/www/jp2.html b/www/jp2.html
index 9e603eb..d02d1fe 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -1,230 +1,61 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html version="-//W3C//DTD XHTML 1.1//EN"
- xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/1999/xhtml
- http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html lang="en">
<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- <meta name=viewport content="width=device-width, initial-scale=0.3333334">
- <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"/>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>ImageMagick: JP2 Encoding Options</title>
- <meta http-equiv="content-language" content="en-US"/>
- <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
- <meta http-equiv="reply-to" content="magick-users@imagemagick.org"/>
- <meta name="application-name" content="ImageMagick"/>
- <meta name="description" content="A collection of tools and libraries to read, write, and manipulate an image in any of the more popular image formats."/>
- <meta name="application-url" content="http://www.imagemagick.org"/>
- <meta name="generator" content="PHP"/>
- <meta name="keywords" content="jp2, encoding, options, convert, edit, compose, image, pixel"/>
- <meta name="rating" content="GENERAL"/>
- <meta name="robots" content="INDEX, FOLLOW"/>
- <meta name="generator" content="ImageMagick Studio LLC"/>
- <meta name="author" content="ImageMagick Studio LLC"/>
- <meta name="revisit-after" content="2 DAYS"/>
- <meta name="resource-type" content="document"/>
- <meta name="copyright" content="Copyright (c) 1999-2012 ImageMagick Studio LLC"/>
- <meta name="distribution" content="Global"/>
- <link rel="icon" href="../images/wand.png"/>
- <link rel="shortcut icon" href="../images/wand.ico" type="images/x-icon"/>
- <link rel="canonical" href="http://www.imagemagick.org" />
- <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
-
- <!-- Add jQuery library -->
- <script type="text/javascript" src="http://localhost/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
-
- <!-- Add mousewheel plugin (this is optional) -->
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/lib/jquery.mousewheel-3.0.6.pack.js"></script>
-
- <!-- Add fancyBox -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.1.5" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.1.5"></script>
-
- <!-- Optionally add helpers - button, thumbnail and/or media -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.css?v=1.0.5" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.js?v=1.0.5"></script>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-media.js?v=1.0.6"></script>
-
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=1.0.7" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=1.0.7"></script>
-
- <script type="text/javascript">
- $(document).ready(function() {
- $(".fancybox").fancybox();
- });
- </script>
-
- <!-- ImageMagick style -->
- <style type="text/css" media="all">
- @import url("../www/magick.css");
- </style>
+ <meta http-equiv="content-language" content="en-US">
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <meta http-equiv="reply-to" content="magick-users@imagemagick.org">
+ <meta name="application-name" content="ImageMagick">
+ <meta name="description" content="ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 200) including PNG, JPEG, JPEG-2000, GIF, WebP, Postscript, PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.">
+ <meta name="application-url" content="http://www.imagemagick.org">
+ <meta name="generator" content="PHP">
+ <meta name="keywords" content="jp2, encoding, options, ImageMagick, PerlMagick, image processing, image, photo, software, Magick++, OpenMP, convert">
+ <meta name="rating" content="GENERAL">
+ <meta name="robots" content="INDEX, FOLLOW">
+ <meta name="generator" content="ImageMagick Studio LLC">
+ <meta name="author" content="ImageMagick Studio LLC">
+ <meta name="revisit-after" content="2 DAYS">
+ <meta name="resource-type" content="document">
+ <meta name="copyright" content="Copyright (c) 1999-2012 ImageMagick Studio LLC">
+ <meta name="distribution" content="Global">
+ <link rel="icon" href="../images/wand.png">
+ <link rel="shortcut icon" href="../images/wand.ico" type="images/x-icon">
+ <link rel="stylesheet" href="www/css/bootstrap.min.css">
+ <link rel="stylesheet" href="www/css/magick.css">
</head>
-<body id="www-imagemagick-org">
-
-<script type="text/javascript">
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'offline-script','//www.google-analytics.com/analytics.js','ga');
-
- ga('create', 'UA-40133312-1', 'imagemagick.org');
- ga('send', 'pageview');
-</script>
-
-<div class="titlebar">
-<div style="margin: 17px auto; float: left;">
- <script type="text/javascript">
- <!--
- google_ad_client = "pub-3129977114552745";
- google_ad_slot = "5439289906";
- google_ad_width = 728;
- google_ad_height = 90;
- //-->
- </script>
- <script type="text/javascript"
- src="http://localhost/pagead/show_ads.js">
- </script>
-</div>
-<a href="../discourse-server">
- <img src="../images/logo.jpg"
- alt="ImageMagick Logo" width="123" height="118"
- style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
-<a href="http://www.imagemagick.org/ImageMagick-7.0.0/index.html">
- <img src="../images/sprite.jpg"
- alt="ImageMagick Sprite" width="114" height="118"
- style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
-</div>
-
-<div class="westbar">
-
-<div class="menu">
- <a title="About ImageMagick" href="http://www.imagemagick.org/ImageMagick-7.0.0/index.html">About ImageMagick</a>
-</div>
-<div class="menu">
- <a title="Binary Releases" href="binary-releases.html">Binary Releases</a>
-</div>
-<div class="sub">
- <a title="Binary Release: Unix" href="binary-releases.html#unix">Unix</a>
-</div>
-<div class="sub">
- <a title="Binary Release: MacOS X" href="binary-releases.html#macosx">Mac OS X</a>
-</div>
-<div class="sub">
- <a title="Binary Release: iOS" href="binary-releases.html#iOS">iOS</a>
-</div>
-<div class="sub">
- <a title="Binary Release: Windows" href="binary-releases.html#windows">Windows</a>
-</div>
-<div class="sep"></div>
-<div class="menu">
- <a title="Command-line Tools" href="command-line-tools.html">Command-line Tools</a>
-</div>
-<div class="sub">
- <a title="Command-line Tools: Processing" href="command-line-processing.html">Processing</a>
-</div>
-<div class="sub">
- <a title="Command-line Tools: Options" href="command-line-options.html">Options</a>
-</div>
-<div class="sub">
- <a title="Command-line Tools: Usage" href="http://www.imagemagick.org/Usage/">Usage</a>
-</div>
-<div class="menu">
- <a title="Program Interfaces" href="api.html">Program Interfaces</a>
-</div>
-<div class="sub">
- <a title="Program Interface: MagickWand" href="magick-wand.html">MagickWand</a>
-</div>
-<div class="sub">
- <a title="Program Interface: MagickCore" href="magick-core.html">MagickCore</a>
-</div>
-<div class="sub">
- <a title="Program Interface: PerlMagick" href="perl-magick.html">PerlMagick</a>
-</div>
-<div class="sub">
- <a title="Program Interface: Magick++" href="magick++.html">Magick++</a>
-</div>
-<div class="sep"></div>
-<div class="menu">
- <a title="Install from Source" href="install-source.html">Install from Source</a>
-</div>
-<div class="sub">
- <a title="Install from Source: Unix" href="install-source.html#unix">Unix</a>
-</div>
-<div class="sub">
- <a title="Install from Source: Windows" href="install-source.html#windows">Windows</a>
- </div>
-<div class="menu">
- <a title="Resources" href="resources.html">Resources</a>
-</div>
-<div class="menu">
- <a title="Architecture" href="architecture.html">Architecture</a>
-</div>
-<div class="menu">
- <a title="Download" href="download.html">Download</a>
-</div>
-<div class="sep"></div>
-<div class="menu">
- <a title="Search" href="search.html">Search</a>
-</div>
-<div class="sep"></div>
-<div class="menu">
- <a title="Site Map" href="sitemap.html">Site Map</a>
-</div>
-<div class="sub">
- <a title="Site Map: Links" href="links.html">Links</a>
-</div>
-<div class="sep"></div>
-</div>
-
-<div class="eastbar">
- <script type="text/javascript">
- /* <![CDATA[ */
- window.___gcfg = {
- lang: 'en-US'
- };
-
- (function() {
- var po = document.createElement('offline-script');
- po.type = 'text/javascript';
- po.async = true;
- po.src = 'https://apis.google.com/js/plusone.js';
- var script = document.getElementsByTagName('offline-script')[0];
- script.parentNode.insertBefore(po, script);
- })();
- var gplusone = document.getElementById("gplusone");
- gplusone.setAttribute("data-size","medium");
- gplusone.setAttribute("data-count","true");
- /* ]]> */
- </script>
- <script type="text/javascript">
- /* <![CDATA[ */
- (function() {
- var po = document.createElement('offline-script'), t = document.getElementsByTagName('offline-script')[0];
- po.type = 'text/javascript';
- po.async = true;
- po.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
- var script = document.getElementsByTagName('offline-script')[0];
- script.parentNode.insertBefore(po, script);
- })();
- /* ]]> */
- </script>
- <div> <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.imagemagick.org/"></a></div>
- <noscript>
- <a href="http://flattr.com/thing/947300/Convert-Edit-And-Compose-Images" target="_blank">
- <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" width="93" height="20" border="0" /></a>
- </noscript>
- <div class="g-plusone" data-size="standard" data-count="true"></div>
-</div>
-
+<body>
<div class="main">
+<div class="magick-masthead">
+ <div class="container">
+ <script type="text/javascript">
+ <!--
+ google_ad_client = "pub-3129977114552745";
+ google_ad_slot = "5439289906";
+ google_ad_width = 728;
+ google_ad_height = 90;
+ //-->
+ </script>
+ <center><script type="text/javascript" src="http://localhost/pagead/show_ads.js">
+ </script></center>
+ <nav class="magick-nav">
+ <a class="magick-nav-item " href="http://www.imagemagick.org/ImageMagick-7.0.0/index.html">Home</a>
+ <a class="magick-nav-item " href="binary-releases.html">Downloads</a>
+ <a class="magick-nav-item " href="command-line-tools.html">Tools</a>
+ <a class="magick-nav-item " href="command-line-options.html">Options</a>
+ <a class="magick-nav-item " href="api.html">Development</a>
+ <a class="magick-nav-item" href="../discourse-server">Community</a>
+ <a class="magick-nav-item navbar-right " href="search.html">Search</a>
+ </nav>
+ </div>
+</div>
+<div class="container">
+<div class="magick-header">
-<h1>ImageMagick JPEG-2000 Image Format</h1>
-<p class="navigation-index"></p>
-
-<p>ImageMagick's JPEG-2000 image formats, JP2 and JPC, accept a plethora of encoding options as detailed below. As an example, suppose you are interested in these options:</p>
+<p class="lead magick-description">ImageMagick's JPEG-2000 image formats, JP2 and JPC, accept a plethora of encoding options as detailed below. As an example, suppose you are interested in these options:</p>
<ul>
<li>code blocks are 64 samples in width and 32 samples in height</li>
@@ -235,62 +66,111 @@
<p>Use this command to convert a JPEG-2000 image to the PNG image format:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert wizard.jp2 wizard.png</span></p>
+<pre>
+convert wizard.jp2 wizard.png
+</pre>
+
<p>Here we extract an area from the image:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert 'wizard.jp2[640x480+0+0]' wizard.png</span></p>
+<pre>
+convert 'wizard.jp2[640x480+0+0]' wizard.png
+</pre>
+
<p>Extract a particular tile from the image:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert 'wizard.jp2[2]' wizard.png</span></p>
+<pre>
+convert 'wizard.jp2[2]' wizard.png
+</pre>
+
<p>Specify a subsampling factor:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert wizard.png -colorspace YUV -sampling-factor 2,2 wizard.jp2</span></p>
+<pre>
+convert wizard.png -colorspace YUV -sampling-factor 2,2 wizard.jp2
+</pre>
+
<p>Save a tiled JPEG-2000 image:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert wizard.png 'wizard.png[512x512]'</span></p>
+<pre>
+convert wizard.png 'wizard.png[512x512]'
+</pre>
+
<p>Write a digital Cinema 4K profile compliant codestream:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert wizard.png -resize 4096x2160! -depth 12 wizard.jp2</span></p>
+<pre>
+convert wizard.png -resize 4096x2160! -depth 12 wizard.jp2
+</pre>
+
<p>Here is a complete list of JPEG-2000 decoding options:</p>
-<dl class="doc">
-<dt class="doc">jp2:layer-number=<em>x</em></dt>
-<dd>set the maximum number of quality layers to decode.</dd>
-<dt class="doc">jp2:reduce-factor=<em>x</em></dt>
-<dd>set the number of highest resolution levels to be discarded.</dd>
-</dl>
+<div class="table-responsive">
+<table class="table table-condensed table-striped">
+ <tr>
+ <td>jp2:layer-number=<var>x</var></td>
+ <td>set the maximum number of quality layers to decode.</td>
+ </tr>
+ <tr>
+ <td>jp2:reduce-factor=<var>x</var></td>
+ <td>set the number of highest resolution levels to be discarded.</td>
+ </tr>
+</table></div>
<p>Here is a complete list of JPEG-2000 encoding options:</p>
-<dl class="doc">
-<dt class="doc">jp2:number-resolutions=<em>x</em></dt>
-<dd>number of resolutions to encode.</dd>
-<dt class="doc">jp2:quality=<em>x</em>,<em>x</em>,...</dt>
-<dd>set the quality layer PSNR, given in dB. The order is from left to right in ascending order. The default is a single lossless quality layer.</dd>
-<dt class="doc">jp2:rate=<em>x</em>,<em>x</em>,...</dt>
-<dd>the compression ratio values. Each value is a factor of compression, thus 20 means 20 times compressed. The order is from left to right in descending order. A final lossless quality layer is signified by the value 1. The default is a single lossless quality layer.</dd>
-<dt class="doc">jp2:progression-order=<em>x</em></dt>
-<dd>choose from LRCP, RLCP, RPCL, PCRL or CPRL.</dd>
-</dl>
-</dl>
-
+<div class="table-responsive">
+<table class="table table-condensed table-striped">
+ <tr>
+ <dt>jp2:number-resolutions=<var>x</var></dt>
+ <dd>number of resolutions to encode.</dd>
+ </tr>
+ <tr>
+ <td>jp2:quality=<var>x</var>,<var>x</var>,...</td>
+ <td>set the quality layer PSNR, given in dB. The order is from left to right in ascending order. The default is a single lossless quality layer.</td>
+ </tr>
+ <tr>
+ <td>jp2:rate=<var>x</var>,<var>x</var>,...</td>
+ <td>the compression ratio values. Each value is a factor of compression, thus 20 means 20 times compressed. The order is from left to right in descending order. A final lossless quality layer is signified by the value 1. The default is a single lossless quality layer.</td>
+ </tr>
+ <tr>
+ <td>jp2:progression-order=<var>x</var></td>
+ <td>choose from LRCP, RLCP, RPCL, PCRL or CPRL.</td>
+ </tr>
+</table></div>
</div>
+ <footer class="magick-footer">
+ <div class="magick-nav-item navbar-left">
+ <a href="support.html">Donations</a>
+ </div>
+ <div class="magick-nav-item navbar-right">
+ <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.imagemagick.org/"></a>
+ <noscript>
+ <a href="http://flattr.com/thing/947300/Convert-Edit-And-Compose-Images" target="_blank">
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0"></a>
+ </noscript>
+ </div>
+ <p><a href="sitemap.html">Sitemap</a> •
+ <a href="links.html">Related</a> •
+ <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Image Studio</a> •
+ <a href="http://jqmagick.imagemagick.org/">JqMagick</a> •
+ <a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a>
+</p>
+ <p><a href="jp2.html#">Back to top</a> •
+ <a href="contact.html">Contact Us</a></p>
+ </footer>
+</div><!-- /.container -->
-<div id="linkbar">
- <span id="linkbar-west"> </span>
-
- <span id="linkbar-center">
- <a href="../discourse-server">Discourse Server</a> •
- <a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a> •
- <a href="http://jqmagick.imagemagick.org/">JqMagick</a>
- </span>
- <span id="linkbar-east"> </span>
+ <script src="https://localhost/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+ <script src="../js/bootstrap.min.js"></script>
+ <script type="text/javascript">
+ /* */
+ (function() {
+ var s = document.createElement('offline-script'), t = document.getElementsByTagName('offline-script')[0];
+ s.type = 'text/javascript';
+ s.async = true;
+ s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+ t.parentNode.insertBefore(s, t);
+ })();
+ /* */
+ </script>
</div>
-<div class="footer">
- <span id="footer-west">© 1999-2014 ImageMagick Studio LLC</span>
- <span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>
-</div>
-<div style="clear: both; margin: 0; width: 100%; "></div>
</body>
</html>