diff options
| author | Andres Rey <[email protected]> | 2017-11-11 11:40:22 +0000 |
|---|---|---|
| committer | Andres Rey <[email protected]> | 2017-11-11 11:40:22 +0000 |
| commit | 4e818bde0bf813e23baf8351c2834cb9ca44f107 (patch) | |
| tree | 04a23b25b20c58241cbebc17928f44da46564ab4 /test/test-pages | |
| parent | 71c4d38631eeaaf07eea6a4718d0a46f636da1da (diff) | |
Fix test cases for the new changes
Diffstat (limited to 'test/test-pages')
| -rw-r--r-- | test/test-pages/blogger/expected.html | 184 | ||||
| -rw-r--r-- | test/test-pages/daringfireball-1/expected.html | 27 | ||||
| -rw-r--r-- | test/test-pages/ehow-2/expected.html | 255 | ||||
| -rw-r--r-- | test/test-pages/iab-1/expected.html | 54 | ||||
| -rw-r--r-- | test/test-pages/ietf-1/expected.html | 4 | ||||
| -rw-r--r-- | test/test-pages/liberation-1/expected.html | 29 | ||||
| -rw-r--r-- | test/test-pages/lwn-1/expected.html | 944 | ||||
| -rw-r--r-- | test/test-pages/remove-extra-brs/expected.html | 29 | ||||
| -rw-r--r-- | test/test-pages/remove-extra-paragraphs/expected.html | 34 | ||||
| -rw-r--r-- | test/test-pages/reordering-paragraphs/expected.html | 31 | ||||
| -rw-r--r-- | test/test-pages/replace-brs/expected.html | 25 |
11 files changed, 666 insertions, 950 deletions
diff --git a/test/test-pages/blogger/expected.html b/test/test-pages/blogger/expected.html index 7b55749..fcd5a2d 100644 --- a/test/test-pages/blogger/expected.html +++ b/test/test-pages/blogger/expected.html @@ -1,127 +1,57 @@ -<div id="readability-page-1" class="page"> - <div class="post-body entry-content" id="post-body-932306423056216142" itemprop="description articleBody"> - <p style="display: inline;" class="readability-styled"> I've written a couple of posts in the past few months but they were all for </p><a href="http://blog.ioactive.com/search/label/Andrew%20Zonenberg">the blog at work</a> - <p style="display: inline;" class="readability-styled"> so I figured I'm long overdue for one on Silicon Exposed.</p> - <p> - <h2> So what's a GreenPak?</h2> - </p> - <p style="display: inline;" class="readability-styled"> Silego Technology is a fabless semiconductor company located in the SF Bay area, which makes (among other things) a line of programmable logic devices known as GreenPak. Their </p><a href="http://www.silego.com/products/greenpak5.html">5th generation parts</a> - <p style="display: inline;" class="readability-styled"> were just announced, but I started this project before that happened so I'm still targeting the </p><a href="http://www.silego.com/products/greenpak4.html">4th generation</a> - <p style="display: inline;" class="readability-styled">.</p> - <p> GreenPak devices are kind of like itty bitty <a href="http://www.cypress.com/products/32-bit-arm-cortex-m-psoc">PSoCs</a> - they have a mixed signal fabric with an ADC, DACs, comparators, voltage references, plus a digital LUT/FF fabric and some typical digital MCU peripherals like counters and oscillators (but no CPU).</p> - <p> It's actually an interesting architecture - FPGAs (including some devices marketed as CPLDs) are a 2D array of LUTs connected via wires to adjacent cells, and true (product term) CPLDs are a star topology of AND-OR arrays connected by a crossbar. GreenPak, on the other hand, is a star topology of LUTs, flipflops, and analog/digital hard IP connected to a crossbar.</p> - <p> Without further ado, here's a block diagram showing all the cool stuff you get in the SLG46620V:</p> - <p> - <table align="center" cellpadding="0" cellspacing="0" class="tr-caption-container"> - <tbody> - <tr> - <td> - <a href="https://1.bp.blogspot.com/-YIPC5jkXkDE/Vy7YPSqFKWI/AAAAAAAAAxI/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB/s1600/block-diagram.png" imageanchor="1"><img border="0" height="512" src="https://1.bp.blogspot.com/-YIPC5jkXkDE/Vy7YPSqFKWI/AAAAAAAAAxI/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB/s640/block-diagram.png" width="640" /></a> - </td> - </tr> - <tr> - <td class="tr-caption">SLG46620V block diagram (from device datasheet)</td> - </tr> - </tbody> - </table> They're also tiny (the SLG46620V is a 20-pin 0.4mm pitch STQFN measuring 2x3 mm, and the lower gate count SLG46140V is a mere 1.6x2 mm) and probably the cheapest programmable logic device on the market - $0.50 in low volume and less than $0.40 in larger quantities.</p> - <p> The Vdd range of GreenPak4 is huge, more like what you'd expect from an MCU than an FPGA! It can run on anything from 1.8 to 5V, although performance is only specified at 1.8, 3.3, and 5V nominal voltages. There's also a dual-rail version that trades one of the GPIO pins for a second power supply pin, allowing you to interface to logic at two different voltage levels.</p> - <p> To support low-cost/space-constrained applications, they even have the configuration memory on die. It's one-time programmable and needs external Vpp to program (presumably Silego didn't want to waste die area on charge pumps that would only be used once) but has a SRAM programming mode for prototyping.</p> - <p> The best part is that the development software (GreenPak Designer) is free of charge and provided for all major operating systems including Linux! Unfortunately, the only supported design entry method is schematic entry and there's no way to write your design in a HDL.</p> - <p> While schematics may be fine for quick tinkering on really simple designs, they quickly get unwieldy. The nightmare of a circuit shown below is just a bunch of counters hooked up to LEDs that blink at various rates.</p> - <p> - <table align="center" cellpadding="0" cellspacing="0" class="tr-caption-container"> - <tbody> - <tr> - <td> - <a href="https://1.bp.blogspot.com/-k3naUT3uXao/Vy7WFac246I/AAAAAAAAAw8/mePy_ostO8QJra5ZJrbP2WGhTlJ0B_r8gCLcB/s1600/schematic-from-hell.png" imageanchor="1"><img border="0" height="334" src="https://1.bp.blogspot.com/-k3naUT3uXao/Vy7WFac246I/AAAAAAAAAw8/mePy_ostO8QJra5ZJrbP2WGhTlJ0B_r8gCLcB/s640/schematic-from-hell.png" width="640" /></a> - </td> - </tr> - <tr> - <td class="tr-caption">Schematic from hell!</td> - </tr> - </tbody> - </table> As if this wasn't enough of a problem, the largest GreenPak4 device (the SLG46620V) is split into two halves with limited routing between them, and the GUI doesn't help the user manage this complexity at all - you have to draw your schematic in two halves and add "cross connections" between them.</p> - <p> The icing on the cake is that schematics are a pain to diff and collaborate on. Although GreenPak schematics are XML based, which is a touch better than binary, who wants to read a giant XML diff and try to figure out what's going on in the circuit?</p> - <p> This isn't going to be a post on the quirks of Silego's software, though - that would be boring. As it turns out, there's one more exciting feature of these chips that I didn't mention earlier: the configuration bitstream is 100% documented in the device datasheet! This is unheard of in the programmable logic world. As Nick of Arachnid Labs <a href="http://www.arachnidlabs.com/blog/2015/03/30/greenpak/">says</a>, the chip is "just dying for someone to write a VHDL or Verilog compiler for it". As you can probably guess by from the title of this post, I've been busy doing exactly that.</p> - <p> - <h2> Great! How does it work?</h2> - </p> - <p style="display: inline;" class="readability-styled"> Rather than wasting time writing a synthesizer, I decided to write a GreenPak technology library for Clifford Wolf's excellent open source synthesis tool, </p><a href="http://www.clifford.at/yosys/">Yosys</a> - <p style="display: inline;" class="readability-styled">, and then make a place-and-route tool to turn that into a final netlist. The post-PAR netlist can then be loaded into GreenPak Designer in order to program the device.</p> - <p> The first step of the process is to run the "synth_greenpak4" Yosys flow on the Verilog source. This runs a generic RTL synthesis pass, then some coarse-grained extraction passes to infer shift register and counter cells from behavioral logic, and finally maps the remaining logic to LUT/FF cells and outputs a JSON-formatted netlist.</p> - <p> Once the design has been synthesized, my tool (named, surprisingly, gp4par) is then launched on the netlist. It begins by parsing the JSON and constructing a directed graph of cell objects in memory. A second graph, containing all of the primitives in the device and the legal connections between them, is then created based on the device specified on the command line. (As of now only the SLG46620V is supported; the SLG46621V can be added fairly easily but the SLG46140V has a slightly different microarchitecture which will require a bit more work to support.)</p> - <p> After the graphs are generated, each node in the netlist graph is assigned a numeric label identifying the type of cell and each node in the device graph is assigned a list of legal labels: for example, an I/O buffer site is legal for an input buffer, output buffer, or bidirectional buffer.</p> - <p> - <table align="center" cellpadding="0" cellspacing="0" class="tr-caption-container"> - <tbody> - <tr> - <td> - <a href="https://2.bp.blogspot.com/-kIekczO693g/Vy7dBqYifXI/AAAAAAAAAxc/hMNJBs5bedIQOrBzzkhq4gbmhR-n58EQwCLcB/s1600/graph-labels.png" imageanchor="1"><img border="0" height="141" src="https://2.bp.blogspot.com/-kIekczO693g/Vy7dBqYifXI/AAAAAAAAAxc/hMNJBs5bedIQOrBzzkhq4gbmhR-n58EQwCLcB/s400/graph-labels.png" width="400" /></a> - </td> - </tr> - <tr> - <td class="tr-caption">Example labeling for a subset of the netlist and device graphs</td> - </tr> - </tbody> - </table> The labeled nodes now need to be placed. The initial placement uses a simple greedy algorithm to create a valid (although not necessarily optimal or even routable) placement:</p><br/> - <ol> - <li>Loop over the cells in the netlist. If any cell has a LOC constraint, which locks the cell to a specific physical site, attempt to assign the node to the specified site. If the specified node is the wrong type, doesn't exist, or is already used by another constrained node, the constraint is invalid so fail with an error.</li> - <li>Loop over all of the unconstrained cells in the netlist and assign them to the first unused site with the right label. If none are available, the design is too big for the device so fail with an error.</li> - </ol> - <p style="display: inline;" class="readability-styled"> Once the design is placed, the placement optimizer then loops over the design and attempts to improve it. A simulated annealing algorithm is used, where changes to the design are accepted unconditionally if they make the placement better, and with a random, gradually decreasing probability if they make it worse. The optimizer terminates when the design receives a perfect score (indicating an optimal placement) or if it stops making progress for several iterations. Each iteration does the following:</p><br/> - <ol> - <li>Compute a score for the current design based on the number of unroutable nets, the amount of routing congestion (number of nets crossing between halves of the device), and static timing analysis (not yet implemented, always zero).</li> - <li>Make a list of nodes that contributed to this score in some way (having some attached nets unroutable, crossing to the other half of the device, or failing timing).</li> - <li>Remove nodes from the list that are LOC'd to a specific location since we're not allowed to move them.</li> - <li>Remove nodes from the list that have only one legal placement in the device (for example, oscillator hard IP) since there's nowhere else for them to go.</li> - <li>Pick a node from the remainder of the list at random. Call this our pivot.</li> - <li>Find a list of candidate placements for the pivot: </li> - <ol> - <li>Consider all routable placements in the other half of the device.</li> - <li>If none were found, consider all routable placements anywhere in the device.</li> - <li>If none were found, consider all placements anywhere in the device even if they're not routable.</li> - </ol> - <li>Pick one of the candidates at random and move the pivot to that location. If another cell in the netlist is already there, put it in the vacant site left by the pivot.</li> - <li>Re-compute the score for the design. If it's better, accept this change and start the next iteration.</li> - <li>If the score is worse, accept it with a random probability which decreases as the iteration number goes up. If the change is not accepted, restore the previous placement.</li> - </ol> - <p style="display: inline;" class="readability-styled"> After optimization, the design is checked for routability. If any edges in the netlist graph don't correspond to edges in the device graph, the user probably asked for something impossible (for example, trying to hook a flipflop's output to a comparator's reference voltage input) so fail with an error.</p> - <p> The design is then routed. This is quite simple due to the crossbar structure of the device. For each edge in the netlist:</p><br/> - <ol> - <li>If dedicated (non-fabric) routing is used for this path, configure the destination's input mux appropriately and stop.</li> - <li>If the source and destination are in the same half of the device, configure the destination's input mux appropriately and stop.</li> - <li>A cross-connection must be used. Check if we already used one to bring the source signal to the other half of the device. If found, configure the destination to route from that cross-connection and stop.</li> - <li>Check if we have any cross-connections left going in this direction. If they're all used, the design is unroutable due to congestion so fail with an error.</li> - <li>Pick the next unused cross-connection and configure it to route from the source. Configure the destination to route from the cross-connection and stop.</li> - </ol> - <p style="display: inline;" class="readability-styled"> Once routing is finished, run a series of post-PAR design rule checks. These currently include the following:</p><br/> - <ul> - <li>If any node has no loads, generate a warning</li> - <li>If an I/O buffer is connected to analog hard IP, fail with an error if it's not configured in analog mode.</li> - <li>Some signals (such as comparator inputs and oscillator power-down controls) are generated by a shared mux and fed to many loads. If different loads require conflicting settings for the shared mux, fail with an error.</li> - </ul> - <p style="display: inline;" class="readability-styled"> If DRC passes with no errors, configure all of the individual cells in the netlist based on the HDL parameters. Fail with an error if an invalid configuration was requested.</p> - <p> Finally, generate the bitstream from all of the per-cell configuration and write it to a file.</p> - <p> - <h2> Great, let's get started!</h2> If you don't already have one, you'll need to buy a <a href="http://www.silego.com/buy/index.php?main_page=product_info&products_id=388">GreenPak4 development kit</a>. The kit includes samples of the SLG46620V (among other devices) and a programmer/emulation board. While you're waiting for it to arrive, install <a href="http://www.silego.com/softdoc/software.html">GreenPak Designer</a>.</p> - <p> Download and install Yosys. Although Clifford is pretty good at merging my pull requests, only <a href="https://github.com/azonenberg/yosys/">my fork on Github</a> is guaranteed to have the most up-to-date support for GreenPak devices so don't be surprised if you can't use a bleeding-edge feature with mainline Yosys.</p> - <p> Download and install gp4par. You can get it from <a href="https://github.com/azonenberg/openfpga/">the Github repository</a>.</p> - <p> Write your HDL, compile with Yosys, P&R with gp4par, and import the bitstream into GreenPak Designer to program the target device. The most current gp4par manual is included in LaTeX source form in the source tree and is automatically built as part of the compile process. If you're just browsing, there's a <a href="http://thanatos.virtual.antikernel.net/unlisted/gp4-hdl.pdf">relatively recent PDF version</a> on my web server.</p> - <p> If you'd like to see the Verilog that produced the nightmare of a schematic I showed above, <a href="https://github.com/azonenberg/openfpga/blob/master/tests/greenpak4/Blinky/Blinky.v">here it is</a>.</p> - <p> Be advised that this project is still very much a work in progress and there are still a number of SLG46620V features I don't support (see the manual for exact details).</p> - <p> - <h2> I love it / it segfaulted / there's a problem in the manual!</h2> Hop in our IRC channel (##openfpga on Freenode) and let me know. Feedback is great, pull requests are even better,</p> - <p> - <h2> You're competing with Silego's IDE. Have they found out and sued you yet?</h2> Nope. They're fully aware of what I'm doing and are rolling out the red carpet for me. They love the idea of a HDL flow as an alternative to schematic entry and are pretty amazed at how fast it's coming together.</p> - <p> After I reported a few bugs in their datasheets they decided to skip the middleman and give me direct access to the engineer who writes their documentation so that I can get faster responses. The last time I found a problem (two different parts of the datasheet contradicted each other) an updated datasheet was in my inbox and on their website by the next day. I only wish Xilinx gave me that kind of treatment!</p> - <p> They've even <a href="https://twitter.com/SilegoTech/status/717018987771469824">offered me free hardware</a> to help me add support for their latest product family, although I plan to get GreenPak4 support to a more stable state before taking them up on the offer.</p> - <p> - <h2> So what's next?</h2> - </p> - <p style="display: inline;" class="readability-styled"> Better testing, for starters. I have to verify functionality by hand with a DMM and oscilloscope, which is time consuming.</p> - <p> My contact at Silego says they're going to be giving me documentation on the SRAM emulation interface soon, so I'm going to make a hardware-in-loop test platform that connects to my desktop and the Silego ZIF socket, and lets me load new bitstreams via a scriptable interface. It'll have FPGA-based digital I/O as well as an ADC and DAC on every device pin, plus an adjustable voltage regulator for power, so I can feed in arbitrary mixed-signal test waveforms and write PC-based unit tests to verify correct behavior.</p> - <p> Other than that, I want to finish support for the SLG46620V in the next month or two. The SLG46621V will be an easy addition since only one pin and the relevant configuration bits have changed from the 46620 (I suspect they're the same die, just bonded out differently).</p> - <p> Once that's done I'll have to do some more extensive work to add the SLG46140V since the architecture is a bit different (a lot of the combinatorial logic is merged into multi-function blocks). Luckily, the 46140 has a lot in common architecturally with the GreenPak5 family, so once that's done GreenPak5 will probably be a lot easier to add support for.</p> - <p> My thanks go out to Clifford Wolf, whitequark, the IRC users in ##openfpga, and everyone at Silego I've worked with to help make this possible. I hope that one day this project will become mature enough that Silego will ship it as an officially supported extension to GreenPak Designer, making history by becoming the first modern programmable logic vendor to ship a fully open source synthesis and P&R suite. </p> - </div> -</div>
\ No newline at end of file +<div class="post-body entry-content" id="post-body-932306423056216142" itemprop="description articleBody"><p> + I've written a couple of posts in the past few months but they were all for </p><a href="http://blog.ioactive.com/search/label/Andrew%20Zonenberg">the blog at work</a><p> so I figured I'm long overdue for one on Silicon Exposed.</p><p><h2> + So what's a GreenPak?</h2> + </p><p> Silego Technology is a fabless semiconductor company located in the SF Bay area, which makes (among other things) a line of programmable logic devices known as GreenPak. Their </p><a href="http://www.silego.com/products/greenpak5.html">5th generation parts</a><p> were just announced, but I started this project before that happened so I'm still targeting the </p><a href="http://www.silego.com/products/greenpak4.html">4th generation</a><p>.</p><p> GreenPak devices are kind of like itty bitty <a href="http://www.cypress.com/products/32-bit-arm-cortex-m-psoc">PSoCs</a> - they have a mixed signal fabric with an ADC, DACs, comparators, voltage references, plus a digital LUT/FF fabric and some typical digital MCU peripherals like counters and oscillators (but no CPU).</p><p> It's actually an interesting architecture - FPGAs (including some devices marketed as CPLDs) are a 2D array of LUTs connected via wires to adjacent cells, and true (product term) CPLDs are a star topology of AND-OR arrays connected by a crossbar. GreenPak, on the other hand, is a star topology of LUTs, flipflops, and analog/digital hard IP connected to a crossbar.</p><p> Without further ado, here's a block diagram showing all the cool stuff you get in the SLG46620V:</p><p><table align="center" cellpadding="0" cellspacing="0" class="tr-caption-container"><tbody><tr><td> + <a href="https://1.bp.blogspot.com/-YIPC5jkXkDE/Vy7YPSqFKWI/AAAAAAAAAxI/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB/s1600/block-diagram.png" imageanchor="1"><img border="0" height="512" src="https://1.bp.blogspot.com/-YIPC5jkXkDE/Vy7YPSqFKWI/AAAAAAAAAxI/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB/s640/block-diagram.png" width="640"></img></a> + </td> + </tr><tr><td class="tr-caption">SLG46620V block diagram (from device datasheet)</td> + </tr></tbody></table> + They're also tiny (the SLG46620V is a 20-pin 0.4mm pitch STQFN measuring 2x3 mm, and the lower gate count SLG46140V is a mere 1.6x2 mm) and probably the cheapest programmable logic device on the market - $0.50 in low volume and less than $0.40 in larger quantities.</p><p> The Vdd range of GreenPak4 is huge, more like what you'd expect from an MCU than an FPGA! It can run on anything from 1.8 to 5V, although performance is only specified at 1.8, 3.3, and 5V nominal voltages. There's also a dual-rail version that trades one of the GPIO pins for a second power supply pin, allowing you to interface to logic at two different voltage levels.</p><p> To support low-cost/space-constrained applications, they even have the configuration memory on die. It's one-time programmable and needs external Vpp to program (presumably Silego didn't want to waste die area on charge pumps that would only be used once) but has a SRAM programming mode for prototyping.</p><p> The best part is that the development software (GreenPak Designer) is free of charge and provided for all major operating systems including Linux! Unfortunately, the only supported design entry method is schematic entry and there's no way to write your design in a HDL.</p><p> While schematics may be fine for quick tinkering on really simple designs, they quickly get unwieldy. The nightmare of a circuit shown below is just a bunch of counters hooked up to LEDs that blink at various rates.</p><p><table align="center" cellpadding="0" cellspacing="0" class="tr-caption-container"><tbody><tr><td> + <a href="https://1.bp.blogspot.com/-k3naUT3uXao/Vy7WFac246I/AAAAAAAAAw8/mePy_ostO8QJra5ZJrbP2WGhTlJ0B_r8gCLcB/s1600/schematic-from-hell.png" imageanchor="1"><img border="0" height="334" src="https://1.bp.blogspot.com/-k3naUT3uXao/Vy7WFac246I/AAAAAAAAAw8/mePy_ostO8QJra5ZJrbP2WGhTlJ0B_r8gCLcB/s640/schematic-from-hell.png" width="640"></img></a> + </td> + </tr><tr><td class="tr-caption">Schematic from hell!</td> + </tr></tbody></table> + As if this wasn't enough of a problem, the largest GreenPak4 device (the SLG46620V) is split into two halves with limited routing between them, and the GUI doesn't help the user manage this complexity at all - you have to draw your schematic in two halves and add "cross connections" between them.</p><p> The icing on the cake is that schematics are a pain to diff and collaborate on. Although GreenPak schematics are XML based, which is a touch better than binary, who wants to read a giant XML diff and try to figure out what's going on in the circuit?</p><p> This isn't going to be a post on the quirks of Silego's software, though - that would be boring. As it turns out, there's one more exciting feature of these chips that I didn't mention earlier: the configuration bitstream is 100% documented in the device datasheet! This is unheard of in the programmable logic world. As Nick of Arachnid Labs <a href="http://www.arachnidlabs.com/blog/2015/03/30/greenpak/">says</a>, the chip is "just dying for someone to write a VHDL or Verilog compiler for it". As you can probably guess by from the title of this post, I've been busy doing exactly that.</p><p><h2> + Great! How does it work?</h2> + </p><p> Rather than wasting time writing a synthesizer, I decided to write a GreenPak technology library for Clifford Wolf's excellent open source synthesis tool, </p><a href="http://www.clifford.at/yosys/">Yosys</a><p>, and then make a place-and-route tool to turn that into a final netlist. The post-PAR netlist can then be loaded into GreenPak Designer in order to program the device.</p><p> The first step of the process is to run the "synth_greenpak4" Yosys flow on the Verilog source. This runs a generic RTL synthesis pass, then some coarse-grained extraction passes to infer shift register and counter cells from behavioral logic, and finally maps the remaining logic to LUT/FF cells and outputs a JSON-formatted netlist.</p><p> Once the design has been synthesized, my tool (named, surprisingly, gp4par) is then launched on the netlist. It begins by parsing the JSON and constructing a directed graph of cell objects in memory. A second graph, containing all of the primitives in the device and the legal connections between them, is then created based on the device specified on the command line. (As of now only the SLG46620V is supported; the SLG46621V can be added fairly easily but the SLG46140V has a slightly different microarchitecture which will require a bit more work to support.)</p><p> After the graphs are generated, each node in the netlist graph is assigned a numeric label identifying the type of cell and each node in the device graph is assigned a list of legal labels: for example, an I/O buffer site is legal for an input buffer, output buffer, or bidirectional buffer.</p><p><table align="center" cellpadding="0" cellspacing="0" class="tr-caption-container"><tbody><tr><td> + <a href="https://2.bp.blogspot.com/-kIekczO693g/Vy7dBqYifXI/AAAAAAAAAxc/hMNJBs5bedIQOrBzzkhq4gbmhR-n58EQwCLcB/s1600/graph-labels.png" imageanchor="1"><img border="0" height="141" src="https://2.bp.blogspot.com/-kIekczO693g/Vy7dBqYifXI/AAAAAAAAAxc/hMNJBs5bedIQOrBzzkhq4gbmhR-n58EQwCLcB/s400/graph-labels.png" width="400"></img></a> + </td> + </tr><tr><td class="tr-caption">Example labeling for a subset of the netlist and device graphs</td> + </tr></tbody></table> + The labeled nodes now need to be placed. The initial placement uses a simple greedy algorithm to create a valid (although not necessarily optimal or even routable) placement:</p><br></br><ol><li>Loop over the cells in the netlist. If any cell has a LOC constraint, which locks the cell to a specific physical site, attempt to assign the node to the specified site. If the specified node is the wrong type, doesn't exist, or is already used by another constrained node, the constraint is invalid so fail with an error.</li> + <li>Loop over all of the unconstrained cells in the netlist and assign them to the first unused site with the right label. If none are available, the design is too big for the device so fail with an error.</li> + </ol><p> + Once the design is placed, the placement optimizer then loops over the design and attempts to improve it. A simulated annealing algorithm is used, where changes to the design are accepted unconditionally if they make the placement better, and with a random, gradually decreasing probability if they make it worse. The optimizer terminates when the design receives a perfect score (indicating an optimal placement) or if it stops making progress for several iterations. Each iteration does the following:</p><br></br><ol><li>Compute a score for the current design based on the number of unroutable nets, the amount of routing congestion (number of nets crossing between halves of the device), and static timing analysis (not yet implemented, always zero).</li> + <li>Make a list of nodes that contributed to this score in some way (having some attached nets unroutable, crossing to the other half of the device, or failing timing).</li> + <li>Remove nodes from the list that are LOC'd to a specific location since we're not allowed to move them.</li> + <li>Remove nodes from the list that have only one legal placement in the device (for example, oscillator hard IP) since there's nowhere else for them to go.</li> + <li>Pick a node from the remainder of the list at random. Call this our pivot.</li> + <li>Find a list of candidate placements for the pivot: </li> + <ol><li>Consider all routable placements in the other half of the device.</li> + <li>If none were found, consider all routable placements anywhere in the device.</li> + <li>If none were found, consider all placements anywhere in the device even if they're not routable.</li> + </ol><li>Pick one of the candidates at random and move the pivot to that location. If another cell in the netlist is already there, put it in the vacant site left by the pivot.</li> + <li>Re-compute the score for the design. If it's better, accept this change and start the next iteration.</li> + <li>If the score is worse, accept it with a random probability which decreases as the iteration number goes up. If the change is not accepted, restore the previous placement.</li> + </ol><p> + After optimization, the design is checked for routability. If any edges in the netlist graph don't correspond to edges in the device graph, the user probably asked for something impossible (for example, trying to hook a flipflop's output to a comparator's reference voltage input) so fail with an error.</p><p> The design is then routed. This is quite simple due to the crossbar structure of the device. For each edge in the netlist:</p><br></br><ol><li>If dedicated (non-fabric) routing is used for this path, configure the destination's input mux appropriately and stop.</li> + <li>If the source and destination are in the same half of the device, configure the destination's input mux appropriately and stop.</li> + <li>A cross-connection must be used. Check if we already used one to bring the source signal to the other half of the device. If found, configure the destination to route from that cross-connection and stop.</li> + <li>Check if we have any cross-connections left going in this direction. If they're all used, the design is unroutable due to congestion so fail with an error.</li> + <li>Pick the next unused cross-connection and configure it to route from the source. Configure the destination to route from the cross-connection and stop.</li> + </ol><p> + Once routing is finished, run a series of post-PAR design rule checks. These currently include the following:</p><br></br><ul><li>If any node has no loads, generate a warning</li> + <li>If an I/O buffer is connected to analog hard IP, fail with an error if it's not configured in analog mode.</li> + <li>Some signals (such as comparator inputs and oscillator power-down controls) are generated by a shared mux and fed to many loads. If different loads require conflicting settings for the shared mux, fail with an error.</li> + </ul><p> + If DRC passes with no errors, configure all of the individual cells in the netlist based on the HDL parameters. Fail with an error if an invalid configuration was requested.</p><p> Finally, generate the bitstream from all of the per-cell configuration and write it to a file.</p><p><h2> + Great, let's get started!</h2> + If you don't already have one, you'll need to buy a <a href="http://www.silego.com/buy/index.php?main_page=product_info&products_id=388">GreenPak4 development kit</a>. The kit includes samples of the SLG46620V (among other devices) and a programmer/emulation board. While you're waiting for it to arrive, install <a href="http://www.silego.com/softdoc/software.html">GreenPak Designer</a>.</p><p> Download and install Yosys. Although Clifford is pretty good at merging my pull requests, only <a href="https://github.com/azonenberg/yosys/">my fork on Github</a> is guaranteed to have the most up-to-date support for GreenPak devices so don't be surprised if you can't use a bleeding-edge feature with mainline Yosys.</p><p> Download and install gp4par. You can get it from <a href="https://github.com/azonenberg/openfpga/">the Github repository</a>.</p><p> Write your HDL, compile with Yosys, P&R with gp4par, and import the bitstream into GreenPak Designer to program the target device. The most current gp4par manual is included in LaTeX source form in the source tree and is automatically built as part of the compile process. If you're just browsing, there's a <a href="http://thanatos.virtual.antikernel.net/unlisted/gp4-hdl.pdf">relatively recent PDF version</a> on my web server.</p><p> If you'd like to see the Verilog that produced the nightmare of a schematic I showed above, <a href="https://github.com/azonenberg/openfpga/blob/master/tests/greenpak4/Blinky/Blinky.v">here it is</a>.</p><p> Be advised that this project is still very much a work in progress and there are still a number of SLG46620V features I don't support (see the manual for exact details).</p><p><h2> + I love it / it segfaulted / there's a problem in the manual!</h2> + Hop in our IRC channel (##openfpga on Freenode) and let me know. Feedback is great, pull requests are even better,</p><p><h2> + You're competing with Silego's IDE. Have they found out and sued you yet?</h2> + Nope. They're fully aware of what I'm doing and are rolling out the red carpet for me. They love the idea of a HDL flow as an alternative to schematic entry and are pretty amazed at how fast it's coming together.</p><p> After I reported a few bugs in their datasheets they decided to skip the middleman and give me direct access to the engineer who writes their documentation so that I can get faster responses. The last time I found a problem (two different parts of the datasheet contradicted each other) an updated datasheet was in my inbox and on their website by the next day. I only wish Xilinx gave me that kind of treatment!</p><p> They've even <a href="https://twitter.com/SilegoTech/status/717018987771469824">offered me free hardware</a> to help me add support for their latest product family, although I plan to get GreenPak4 support to a more stable state before taking them up on the offer.</p><p><h2> + So what's next?</h2> + </p><p> Better testing, for starters. I have to verify functionality by hand with a DMM and oscilloscope, which is time consuming.</p><p> My contact at Silego says they're going to be giving me documentation on the SRAM emulation interface soon, so I'm going to make a hardware-in-loop test platform that connects to my desktop and the Silego ZIF socket, and lets me load new bitstreams via a scriptable interface. It'll have FPGA-based digital I/O as well as an ADC and DAC on every device pin, plus an adjustable voltage regulator for power, so I can feed in arbitrary mixed-signal test waveforms and write PC-based unit tests to verify correct behavior.</p><p> Other than that, I want to finish support for the SLG46620V in the next month or two. The SLG46621V will be an easy addition since only one pin and the relevant configuration bits have changed from the 46620 (I suspect they're the same die, just bonded out differently).</p><p> Once that's done I'll have to do some more extensive work to add the SLG46140V since the architecture is a bit different (a lot of the combinatorial logic is merged into multi-function blocks). Luckily, the 46140 has a lot in common architecturally with the GreenPak5 family, so once that's done GreenPak5 will probably be a lot easier to add support for.</p><p> My thanks go out to Clifford Wolf, whitequark, the IRC users in ##openfpga, and everyone at Silego I've worked with to help make this possible. I hope that one day this project will become mature enough that Silego will ship it as an officially supported extension to GreenPak Designer, making history by becoming the first modern programmable logic vendor to ship a fully open source synthesis and P&R suite. + + </p></div>
\ No newline at end of file diff --git a/test/test-pages/daringfireball-1/expected.html b/test/test-pages/daringfireball-1/expected.html index 37a4e07..2370e4b 100644 --- a/test/test-pages/daringfireball-1/expected.html +++ b/test/test-pages/daringfireball-1/expected.html @@ -1,14 +1,11 @@ -<div id="readability-page-1" class="page"> - <div id="Box"> - <div id="Main"> - <div class="article"> +<div class="article"> + <p>Daring Fireball is written and produced by John Gruber.</p> <p> - <a href="http://fakehost/graphics/author/addison-bw.jpg"> <img src="http://fakehost/graphics/author/addison-bw-425.jpg" alt="Photograph of the author."/></a> - <br/><em>Portrait by <a href="http://superbiate.com/inquiries/">George Del Barrio</a></em> </p> + <a href="http://fakehost/graphics/author/addison-bw.jpg"> <img alt="Photograph of the author." src="http://fakehost/graphics/author/addison-bw-425.jpg"></img></a> + <br></br><em>Portrait by <a href="http://superbiate.com/inquiries/">George Del Barrio</a></em> </p> <h2>Mac Apps</h2> - <ul> - <li><a href="http://www.barebones.com/products/bbedit/">BBEdit</a></li> + <ul><li><a href="http://www.barebones.com/products/bbedit/">BBEdit</a></li> <li><a href="http://www.flyingmeat.com/acorn/">Acorn</a></li> <li><a href="http://www.red-sweater.com/marsedit/">MarsEdit</a></li> <li><a href="http://aged-and-distilled.com/napkin/">Napkin</a></li> @@ -17,19 +14,13 @@ <li><a href="http://latenightsw.com/sd4/index.html">Script Debugger</a></li> <li><a href="http://www.ambrosiasw.com/utilities/snapzprox/">Snapz Pro X</a></li> <li><a href="http://nightly.webkit.org/">WebKit</a></li> - </ul> - <h2>iPhone Apps</h2> - <ul> - <li><a href="http://vesperapp.co/">Vesper</a></li> - </ul> - <h2>Server Software</h2> + </ul><h2>iPhone Apps</h2> + <ul><li><a href="http://vesperapp.co/">Vesper</a></li> + </ul><h2>Server Software</h2> <p>The Daring Fireball website is hosted by <a href="http://joyent.com/">Joyent</a>.</p> <p>Articles and links are published through <a href="http://movabletype.org/">Movable Type</a>. In addition to my own SmartyPants and Markdown plug-ins, Daring Fireball uses several excellent Movable Type plug-ins, including Brad Choate’s <a href="http://bradchoate.com/weblog/2003/06/24/regular-expressions">MT-Regex</a> and <a href="http://bradchoate.com/weblog/2004/10/20/mtifempty">MT-IfEmpty</a>, and <a href="http://bumppo.net/projects/amputator/">Nat Irons’s Amputator</a>.</p> <p>Stats are tracked using <a href="http://haveamint.com/">Mint</a>. Additional web nerdery, including the membership system, is fueled by <a href="http://perl.org/">Perl</a>, <a href="http://www.php.net/">PHP</a>, and <a href="http://www.mysql.com/">MySQL</a>.</p> <h2>Web Standards</h2> <p>Web standards are important, and Daring Fireball adheres to them. Specifically, Daring Fireball’s HTML markup should validate as either <a href="http://www.whatwg.org/specs/web-apps/current-work/">HTML 5</a> or XHTML 4.01 Transitional, its layout is constructed using <a href="http://jigsaw.w3.org/css-validator/validator?uri=http://daringfireball.net/css/fireball_screen.css">valid CSS</a>, and its syndicated feed is <a href="http://feedvalidator.org/check?url=http%3A%2F%2Fdaringfireball.net%2Findex.xml">valid Atom</a>.</p> <p>If Daring Fireball looks goofy in your browser, you’re likely using a shitty browser that doesn’t support web standards. Internet Explorer, I’m looking in your direction. If you complain about this, I will laugh at you, because I do not care. If, however, you are using a modern, standards-compliant browser and have trouble viewing or reading Daring Fireball, please do let me know.</p> - </div> - </div> - </div> -</div>
\ No newline at end of file + </div>
\ No newline at end of file diff --git a/test/test-pages/ehow-2/expected.html b/test/test-pages/ehow-2/expected.html index c4ecc35..d2148ae 100644 --- a/test/test-pages/ehow-2/expected.html +++ b/test/test-pages/ehow-2/expected.html @@ -1,164 +1,139 @@ -<div id="readability-page-1" class="page"> - <section id="Body" class="InlineTemplate FLC" data-page-id="inlinetemplate" data-section="body"> +<section class="InlineTemplate FLC" data-page-id="inlinetemplate" data-section="body" id="Body"> + <header class="page-head bordered pre-col"> <div data-type="AuthorProfile"> <div class="post-meta clearfix headline6 mg-2"> - <a class="gtm_contributorBylineAvatar contributor-follow-tip" id="img-follow-tip" href="http://fakehost/contributor/gina_robertsgrey/" target="_top"> - <img src="http://img-aws.ehowcdn.com/60x60/cme/cme_public_images/www_demandstudios_com/sitelife.studiod.com/ver1.0/Content/images/store/9/2/d9dd6f61-b183-4893-927f-5b540e45be91.Small.jpg" class="avatar fl" data-failover="//img-aws.ehowcdn.com/60x60/ehow-cdn-assets/test15/media/images/authors/missing-author-image.png" onerror="var failover = this.getAttribute('data-failover'); - if (failover) failover = failover.replace(/^https?:/,''); - var src = this.src ? this.src.replace(/^https?:/,'') : ''; - if (src != failover){ - this.src = failover; - }" /> </a> + <a class="gtm_contributorBylineAvatar contributor-follow-tip" href="http://fakehost/contributor/gina_robertsgrey/" id="img-follow-tip" target="_top"> + <img class="avatar fl" data-failover="//img-aws.ehowcdn.com/60x60/ehow-cdn-assets/test15/media/images/authors/missing-author-image.png" onerror="var failover = this.getAttribute('data-failover');
 if (failover) failover = failover.replace(/^https?:/,'');
 var src = this.src ? this.src.replace(/^https?:/,'') : '';
 if (src != failover){
 this.src = failover;
 }" src="http://img-aws.ehowcdn.com/60x60/cme/cme_public_images/www_demandstudios_com/sitelife.studiod.com/ver1.0/Content/images/store/9/2/d9dd6f61-b183-4893-927f-5b540e45be91.Small.jpg"></img></a> + </div> - <div class="post-meta clearfix headline6 mg-2" id="author_powertip" data-author-url="/contributor/gina_robertsgrey/"> + <div class="post-meta clearfix headline6 mg-2" data-author-url="/contributor/gina_robertsgrey/" id="author_powertip"> <a class="gtm_contributorBylineAvatar" href="http://fakehost/contributor/gina_robertsgrey/" target="_top"> - <img src="http://img-aws.ehowcdn.com/60x60/cme/cme_public_images/www_demandstudios_com/sitelife.studiod.com/ver1.0/Content/images/store/9/2/d9dd6f61-b183-4893-927f-5b540e45be91.Small.jpg" class="avatar fl" data-failover="//img-aws.ehowcdn.com/60x60/ehow-cdn-assets/test15/media/images/authors/missing-author-image.png" onerror="var failover = this.getAttribute('data-failover'); - if (failover) failover = failover.replace(/^https?:/,''); - var src = this.src ? this.src.replace(/^https?:/,'') : ''; - if (src != failover){ - this.src = failover; - }" /> </a> - <p class="btn btnFollow" data-type="contributor" data-author-url="/contributor/gina_robertsgrey/" data-follow-data="{"name":"Gina Roberts-Grey","slug":"\/contributor\/gina_robertsgrey\/","image_url":"http:\/\/s3.amazonaws.com\/cme_public_images\/www_demandstudios_com\/sitelife.studiod.com\/ver1.0\/Content\/images\/store\/9\/2\/d9dd6f61-b183-4893-927f-5b540e45be91.Small.jpg","website":""}">Follow</p> + <img class="avatar fl" data-failover="//img-aws.ehowcdn.com/60x60/ehow-cdn-assets/test15/media/images/authors/missing-author-image.png" onerror="var failover = this.getAttribute('data-failover');
 if (failover) failover = failover.replace(/^https?:/,'');
 var src = this.src ? this.src.replace(/^https?:/,'') : '';
 if (src != failover){
 this.src = failover;
 }" src="http://img-aws.ehowcdn.com/60x60/cme/cme_public_images/www_demandstudios_com/sitelife.studiod.com/ver1.0/Content/images/store/9/2/d9dd6f61-b183-4893-927f-5b540e45be91.Small.jpg"></img></a> + + <p>Follow</p> </div> - <p class="article-meta"> - <time datetime="2016-09-14T07:07:00-04:00" itemprop="dateModified">Last updated September 14, 2016</time> - </p> + <p> + <time datetime="2016-09-14T07:07:00-04:00" itemprop="dateModified">Last updated September 14, 2016</time></p> + </div> - </header> - - <div class="col-main"> - <article data-type="article"> - <div class="mod step"> + + </header><div class="col-main"> + <article data-type="article"><div class="mod step"> <div class="stepContent mod"> <div class="content lead"> <p>Graduation parties are a great way to commemorate the years of hard work teens and college co-eds devote to education. They’re also costly for mom and dad.</p> <p>The average cost of a graduation party in 2013 was a whopping $1,200, according to Graduationparty.com; $700 of that was allocated for food. However that budget was based on Midwestern statistics, and parties in urban areas like New York City are thought to have a much higher price tag.</p> <p>Thankfully, there are plenty of creative ways to trim a little grad party fat without sacrificing any of the fun or celebratory spirit.</p> </div> - <figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/2F/86/5547EF62-EAF5-4256-945D-0496F61C862F/5547EF62-EAF5-4256-945D-0496F61C862F.jpg" alt="Graduation" title="Graduation" class="photo" data-credit="Mike Watson Images/Moodboard/Getty " longdesc="http://s3.amazonaws.com/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/2F/86/5547EF62-EAF5-4256-945D-0496F61C862F/5547EF62-EAF5-4256-945D-0496F61C862F.jpg" data-pin-ehow-hover="true" data-pin-no-hover="true" /> - </figure> - <figcaption class="small caption"> + <figure class="stepThumb"><img alt="Graduation" class="photo" data-credit="Mike Watson Images/Moodboard/Getty " data-pin-ehow-hover="true" data-pin-no-hover="true" longdesc="http://s3.amazonaws.com/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/2F/86/5547EF62-EAF5-4256-945D-0496F61C862F/5547EF62-EAF5-4256-945D-0496F61C862F.jpg" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/2F/86/5547EF62-EAF5-4256-945D-0496F61C862F/5547EF62-EAF5-4256-945D-0496F61C862F.jpg" title="Graduation"></img></figure><figcaption class="small caption"> (Mike Watson Images/Moodboard/Getty) - </figcaption> - </div> + </figcaption></div> </div> - - + + <span> <span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>Parties hosted at restaurants, clubhouses and country clubs eliminate the need to spend hours cleaning up once party guests have gone home. But that convenience comes with a price tag. A country club may charge as much as $2,000 for room rental and restaurant food and beverage will almost always cost more than food prepped and served at home.</p></span></div> - <figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/FE/CB/121569D2-6984-4B2F-83C4-9D2D9A27CBFE/121569D2-6984-4B2F-83C4-9D2D9A27CBFE.jpg" alt="Save money hosting the party at home." class="photo" data-credit="Thomas Jackson/Digital Vision/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" /> - </figure> - <figcaption class="small caption"> - Thomas Jackson/Digital Vision/Getty Images </figcaption> -</div> -</div> -</span> -</span> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>Parties hosted at restaurants, clubhouses and country clubs eliminate the need to spend hours cleaning up once party guests have gone home. But that convenience comes with a price tag. A country club may charge as much as $2,000 for room rental and restaurant food and beverage will almost always cost more than food prepped and served at home.</p></span> </div> + <figure class="stepThumb"><img alt="Save money hosting the party at home." class="photo" data-credit="Thomas Jackson/Digital Vision/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/FE/CB/121569D2-6984-4B2F-83C4-9D2D9A27CBFE/121569D2-6984-4B2F-83C4-9D2D9A27CBFE.jpg"></img></figure><figcaption class="small caption"> + Thomas Jackson/Digital Vision/Getty Images </figcaption></div> + </div> + </span> + </span> + <span> <span> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>Instead of hiring a DJ, use your iPod or Smartphone to spin the tunes. Both easily hook up to most speakers or mp3 compatible docks to play music from your music library. Or download Pandora, the free online radio app, and play hours of music for free.</p> +<p>Personalize the music with a playlist of the grad’s favorite songs or songs that were big hits during his or her years in school.</p></span> </div> + <figure class="stepThumb"><img alt="Online radio can take the place of a hired DJ." class="photo" data-credit="Spencer Platt/Getty Images News/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/DF/FC/A05B0252-BD73-4BC7-A09A-96F0A504FCDF/A05B0252-BD73-4BC7-A09A-96F0A504FCDF.jpg"></img></figure><figcaption class="small caption"> + Spencer Platt/Getty Images News/Getty Images </figcaption></div> + </div> + </span> + </span> + <span> <span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>Instead of hiring a DJ, use your iPod or Smartphone to spin the tunes. Both easily hook up to most speakers or mp3 compatible docks to play music from your music library. Or download Pandora, the free online radio app, and play hours of music for free.</p> -<p>Personalize the music with a playlist of the grad’s favorite songs or songs that were big hits during his or her years in school.</p></span></div> -<figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/DF/FC/A05B0252-BD73-4BC7-A09A-96F0A504FCDF/A05B0252-BD73-4BC7-A09A-96F0A504FCDF.jpg" alt="Online radio can take the place of a hired DJ." class="photo" data-credit="Spencer Platt/Getty Images News/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" /> -</figure> -<figcaption class="small caption"> - Spencer Platt/Getty Images News/Getty Images </figcaption> -</div> -</div> -</span> -</span> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>Avoid canned drinks, which guests often open, but don't finish. Serve pitchers of tap water with lemon and cucumber slices or sliced strawberries for an interesting and refreshing flavor. Opt for punches and non-alcoholic drinks for high school graduates that allow guests to dole out the exact amount they want to drink.</p></span> </div> + <figure class="stepThumb"><img alt="Serve drinks in pitchers, not in cans." class="photo" data-credit="evgenyb/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/EB/DB/8A04CCA7-3255-4225-B59A-C41441F8DBEB/8A04CCA7-3255-4225-B59A-C41441F8DBEB.jpg"></img></figure><figcaption class="small caption"> + evgenyb/iStock/Getty Images </figcaption></div> + </div> + + </span> + </span> + <span> <span> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>Instead of inviting everyone you – and the graduate – know or ever knew, scale back the guest list. Forgo inviting guests that you or your grad haven't seen for eons. There is no reason to provide provisions for people who are essentially out of your lives. Sticking to a small, but personal, guest list allows more time to mingle with loved ones during the party, too.</p></span> </div> + <figure class="stepThumb"><img alt="Limit guests to those close to the graduate." class="photo" data-credit="Kane Skennar/Photodisc/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/94/10/08035476-0167-4A03-AADC-13A7E7AA1094/08035476-0167-4A03-AADC-13A7E7AA1094.jpg"></img></figure><figcaption class="small caption"> + Kane Skennar/Photodisc/Getty Images </figcaption></div> + </div> + </span> + </span> + <span> <span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>Avoid canned drinks, which guests often open, but don't finish. Serve pitchers of tap water with lemon and cucumber slices or sliced strawberries for an interesting and refreshing flavor. Opt for punches and non-alcoholic drinks for high school graduates that allow guests to dole out the exact amount they want to drink.</p></span></div> -<figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/EB/DB/8A04CCA7-3255-4225-B59A-C41441F8DBEB/8A04CCA7-3255-4225-B59A-C41441F8DBEB.jpg" alt="Serve drinks in pitchers, not in cans." class="photo" data-credit="evgenyb/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" /> -</figure> -<figcaption class="small caption"> - evgenyb/iStock/Getty Images </figcaption> -</div> -</div> - -</span> -</span> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>See if your grad and his best friend, girlfriend or close family member would consider hosting a joint party. You can split some of the expenses, especially when the two graduates share mutual friends. You'll also have another parent to bounce ideas off of and to help you stick to your budget when you're tempted to splurge.</p></span> </div> + <figure class="stepThumb"><img alt="Throw a joint bash for big savings." class="photo" data-credit="Mike Watson Images/Moodboard/Getty" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/06/49/4AD62696-FC95-4DA2-8351-42740C7B4906/4AD62696-FC95-4DA2-8351-42740C7B4906.jpg"></img></figure><figcaption class="small caption"> + Mike Watson Images/Moodboard/Getty </figcaption></div> + </div> + </span> + </span> + <span> <span> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>Skip carving stations of prime rib and jumbo shrimp as appetizers, especially for high school graduation parties. Instead, serve some of the graduate's favorite side dishes that are cost effective, like a big pot of spaghetti with breadsticks. Opt for easy and simple food such as pizza, finger food and mini appetizers. </p> +<p>Avoid pre-packaged foods and pre-made deli platters. These can be quite costly. Instead, make your own cheese and deli platters for less than half the cost of pre-made.</p></span> </div> + <figure class="stepThumb"><img alt="Cost effective appetizers are just as satisfying as pre-made deli platters." class="photo" data-credit="Mark Stout/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/D0/51/B6AED06C-5E19-4A26-9AAD-0E175F6251D0/B6AED06C-5E19-4A26-9AAD-0E175F6251D0.jpg"></img></figure><figcaption class="small caption"> + Mark Stout/iStock/Getty Images </figcaption></div> + </div> + </span> + </span> + <span> <span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>Instead of inviting everyone you – and the graduate – know or ever knew, scale back the guest list. Forgo inviting guests that you or your grad haven't seen for eons. There is no reason to provide provisions for people who are essentially out of your lives. Sticking to a small, but personal, guest list allows more time to mingle with loved ones during the party, too.</p></span></div> -<figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/94/10/08035476-0167-4A03-AADC-13A7E7AA1094/08035476-0167-4A03-AADC-13A7E7AA1094.jpg" alt="Limit guests to those close to the graduate." class="photo" data-credit="Kane Skennar/Photodisc/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" /> -</figure> -<figcaption class="small caption"> - Kane Skennar/Photodisc/Getty Images </figcaption> -</div> -</div> -</span> -</span> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>Instead of an evening dinner party, host a grad lunch or all appetizers party. Brunch and lunch fare or finger food costs less than dinner. Guests also tend to consume less alcohol in the middle of the day, which keeps cost down.</p></span> </div> + <figure class="stepThumb"><img alt="A brunch gathering will cost less than a dinner party." class="photo" data-credit="Mark Stout/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/35/B4/DD5FD05A-B631-4AFE-BC8F-FDACAD1EB435/DD5FD05A-B631-4AFE-BC8F-FDACAD1EB435.jpg"></img></figure><figcaption class="small caption"> + Mark Stout/iStock/Getty Images </figcaption></div> + </div> + + + </span> + </span> + <span> <span> -<span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>See if your grad and his best friend, girlfriend or close family member would consider hosting a joint party. You can split some of the expenses, especially when the two graduates share mutual friends. You'll also have another parent to bounce ideas off of and to help you stick to your budget when you're tempted to splurge.</p></span></div> -<figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/06/49/4AD62696-FC95-4DA2-8351-42740C7B4906/4AD62696-FC95-4DA2-8351-42740C7B4906.jpg" alt="Throw a joint bash for big savings." class="photo" data-credit="Mike Watson Images/Moodboard/Getty" data-pin-ehow-hover="true" data-pin-no-hover="true" /> -</figure> -<figcaption class="small caption"> - Mike Watson Images/Moodboard/Getty </figcaption> -</div> -</div> -</span> -</span> -<span> -<span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>Skip carving stations of prime rib and jumbo shrimp as appetizers, especially for high school graduation parties. Instead, serve some of the graduate's favorite side dishes that are cost effective, like a big pot of spaghetti with breadsticks. Opt for easy and simple food such as pizza, finger food and mini appetizers. </p> -<p>Avoid pre-packaged foods and pre-made deli platters. These can be quite costly. Instead, make your own cheese and deli platters for less than half the cost of pre-made.</p></span></div> -<figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/D0/51/B6AED06C-5E19-4A26-9AAD-0E175F6251D0/B6AED06C-5E19-4A26-9AAD-0E175F6251D0.jpg" alt="Cost effective appetizers are just as satisfying as pre-made deli platters." class="photo" data-credit="Mark Stout/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" /> -</figure> -<figcaption class="small caption"> - Mark Stout/iStock/Getty Images </figcaption> -</div> -</div> -</span> -</span> -<span> -<span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>Instead of an evening dinner party, host a grad lunch or all appetizers party. Brunch and lunch fare or finger food costs less than dinner. Guests also tend to consume less alcohol in the middle of the day, which keeps cost down.</p></span></div> -<figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/35/B4/DD5FD05A-B631-4AFE-BC8F-FDACAD1EB435/DD5FD05A-B631-4AFE-BC8F-FDACAD1EB435.jpg" alt="A brunch gathering will cost less than a dinner party." class="photo" data-credit="Mark Stout/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" /> -</figure> -<figcaption class="small caption"> - Mark Stout/iStock/Getty Images </figcaption> -</div> -</div> - - -</span> -</span> -<span> -<span> -<div class="mod step"><div class="stepContent mod"><div class="content"><span><p>Decorate your party in the graduate's current school colors or the colors of the school he or she will be headed to next. Décor that is not specifically graduation-themed may cost a bit less, and any leftovers can be re-used for future parties, picnics and events.</p></span></div> -<figure class="stepThumb"> - <img src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/A1/FA/2C368B34-8F6A-45F6-9DFC-0B0C4E33FAA1/2C368B34-8F6A-45F6-9DFC-0B0C4E33FAA1.jpg" alt="Theme the party by color without graduation-specific decor." class="photo" data-credit="jethuynh/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" /> -</figure> -<figcaption class="small caption"> - jethuynh/iStock/Getty Images </figcaption> -</div> -</div> -</span> -</span> - - -<h2 class="RsTitle head mg-2 title"> - <a target="_blank" href="https://www.google.com/adsense/support/bin/request.py?contact=abg_afc&url=http://ehow.com/&hl=en&client=ehow&gl=US">Related Searches</a> -</h2> - - -<p class="zergnet-pw">Promoted By Zergnet</p> - -</article> -</div> - - -</section> -</div> +<div class="mod step"> +<div class="stepContent mod"> +<div class="content"> +<span><p>Decorate your party in the graduate's current school colors or the colors of the school he or she will be headed to next. Décor that is not specifically graduation-themed may cost a bit less, and any leftovers can be re-used for future parties, picnics and events.</p></span> </div> + <figure class="stepThumb"><img alt="Theme the party by color without graduation-specific decor." class="photo" data-credit="jethuynh/iStock/Getty Images" data-pin-ehow-hover="true" data-pin-no-hover="true" src="http://img-aws.ehowcdn.com/640/cme/cme_public_images/www_ehow_com/cdn-write.demandstudios.com/upload/image/A1/FA/2C368B34-8F6A-45F6-9DFC-0B0C4E33FAA1/2C368B34-8F6A-45F6-9DFC-0B0C4E33FAA1.jpg"></img></figure><figcaption class="small caption"> + jethuynh/iStock/Getty Images </figcaption></div> + </div> + </span> + </span> + + + <h2 class="RsTitle head mg-2 title"> + <a href="https://www.google.com/adsense/support/bin/request.py?contact=abg_afc&url=http://ehow.com/&hl=en&client=ehow&gl=US" target="_blank">Related Searches</a> + </h2> + + + <p>Promoted By Zergnet</p> + </article></div> + + + </section>
\ No newline at end of file diff --git a/test/test-pages/iab-1/expected.html b/test/test-pages/iab-1/expected.html index a0fab78..799c2db 100644 --- a/test/test-pages/iab-1/expected.html +++ b/test/test-pages/iab-1/expected.html @@ -1,32 +1,22 @@ -<div id="readability-page-1" class="page"> - <div class="container module--news"> - <div class="article__content"> - <p>We messed up. As technologists, tasked with delivering content and services to users, we lost track of the user experience.</p> - <p>Twenty years ago we saw an explosion of websites, built by developers around the world, providing all forms of content. This was the beginning of an age of enlightenment, the intersection of content and technology. Many of us in the technical field felt compelled, and even empowered, to produce information as the distribution means for mass communication were no longer restricted by a high barrier to entry.</p> - <p>In 2000, the dark ages came when the dot-com bubble burst. We were told that our startups were gone or that our divisions sustained by corporate parent companies needed to be in the black. It was a wakeup call that led to a renaissance age. Digital advertising became the foundation of an economic engine that, still now, sustains the free and democratic World Wide Web. In digital publishing, we strived to balance content, commerce, and technology. The content management systems and communication gateways we built to inform and entertain populations around the world disrupted markets and in some cases governments, informed communities of imminent danger, and liberated new forms of art and entertainment—all while creating a digital middle class of small businesses.</p> - <p>We engineered not just the technical, but also the social and economic foundation that users around the world came to lean on for access to real time information. And users came to expect this information whenever and wherever they needed it. And more often than not, for anybody with a connected device, it was free.</p> - <p>This was choice—powered by digital advertising—and premised on user experience.</p> - <p>But we messed up.</p> - <p>Through our pursuit of further automation and maximization of margins during the industrial age of media technology, we built advertising technology to optimize publishers’ yield of marketing budgets that had eroded after the last recession. Looking back now, our scraping of dimes may have cost us dollars in consumer loyalty. The fast, scalable systems of targeting users with ever-heftier advertisements have slowed down the public internet and drained more than a few batteries. We were so clever and so good at it that we over-engineered the capabilities of the plumbing laid down by, well, ourselves. This steamrolled the users, depleted their devices, and tried their patience.</p> - <p>The rise of ad blocking poses a threat to the internet and could potentially drive users to an enclosed platform world dominated by a few companies. We have let the fine equilibrium of content, commerce, and technology get out of balance in the open web. We had, and still do have, a responsibility to educate the business side, and in some cases to push back. We lost sight of our social and ethical responsibility to provide a safe, usable experience for anyone and everyone wanting to consume the content of their choice.</p> - <p>We need to bring that back into alignment, starting right now.</p> - <p> - <a href="http://www.iab.com/wp-content/uploads/2015/10/getting-lean-with-digital-ad-ux.jpg"><img width="300" height="250" alt="Getting LEAN with Digital Ad UX" src="http://www.iab.com/wp-content/uploads/2015/10/getting-lean-with-digital-ad-ux-300x250.jpg" class="alignnone size-medium wp-image-15403"/></a>Today, the IAB Tech Lab is launching the L.E.A.N. Ads program. Supported by the Executive Committee of the IAB Tech Lab Board, IABs around the world, and hundreds of member companies, L.E.A.N. stands for Light, Encrypted, Ad choice supported, Non-invasive ads. These are principles that will help guide the next phases of advertising technical standards for the global digital advertising supply chain.</p> - <p>As with any other industry, standards should be created by non-profit standards-setting bodies, with many diverse voices providing input. We will invite all parties for public comment, and make sure consumer interest groups have the opportunity to provide input.</p> - <p>L.E.A.N. Ads do not replace the current advertising standards many consumers still enjoy and engage with while consuming content on our sites across all IP enabled devices. Rather, these principles will guide an alternative set of standards that provide choice for marketers, content providers, and consumers.</p> - <p>Among the many areas of concentration, we must also address frequency capping on retargeting in Ad Tech and make sure a user is targeted appropriately before, but never AFTER they make a purchase. If we are so good at reach and scale, we can be just as good, if not better, at moderation. Additionally, we must address volume of ads per page as well as continue on the path to viewability. The dependencies here are critical to an optimized user experience.</p> - <p>The consumer is demanding these actions, challenging us to do better, and we must respond.</p> - <p>The IAB Tech Lab will continue to provide the tools for publishers in the digital supply chain to have a dialogue with users about their choices so that content providers can generate revenue while creating value. Publishers should have the opportunity to provide rich advertising experiences, L.E.A.N. advertising experiences, and subscription services. Or publishers can simply deny their service to users who choose to keep on blocking ads. That is all part of elasticity of consumer tolerance and choice.</p> - <p>Finally, we must do this in an increasingly fragmented market, across screens. We must do this in environments where entire sites are blocked, purposefully or not. Yes, it is disappointing that our development efforts will have to manage with multiple frameworks while we work to supply the economic engine to sustain an open internet. However, our goal is still to provide diverse content and voices to as many connected users as possible around the world.</p> - <p>That is user experience.</p> - <table> - <tbody> - <tr> - <td>IAB Tech Lab Members can join the IAB Tech Lab Ad Blocking Working Group, please email <a href="mailto:[email protected]">[email protected]</a> for more information.</td> - </tr> - </tbody> - </table> - <p>Read <a target="_blank" href="http://www.iab.com/insights/ad-blocking/">more about ad blocking here</a>.</p> - </div> - </div> -</div>
\ No newline at end of file +<div class="article__content"> + <p>We messed up. As technologists, tasked with delivering content and services to users, we lost track of the user experience.</p> +<p>Twenty years ago we saw an explosion of websites, built by developers around the world, providing all forms of content. This was the beginning of an age of enlightenment, the intersection of content and technology. Many of us in the technical field felt compelled, and even empowered, to produce information as the distribution means for mass communication were no longer restricted by a high barrier to entry.</p> +<p>In 2000, the dark ages came when the dot-com bubble burst. We were told that our startups were gone or that our divisions sustained by corporate parent companies needed to be in the black. It was a wakeup call that led to a renaissance age. Digital advertising became the foundation of an economic engine that, still now, sustains the free and democratic World Wide Web. In digital publishing, we strived to balance content, commerce, and technology. The content management systems and communication gateways we built to inform and entertain populations around the world disrupted markets and in some cases governments, informed communities of imminent danger, and liberated new forms of art and entertainment—all while creating a digital middle class of small businesses.</p> +<p>We engineered not just the technical, but also the social and economic foundation that users around the world came to lean on for access to real time information. And users came to expect this information whenever and wherever they needed it. And more often than not, for anybody with a connected device, it was free.</p> +<p>This was choice—powered by digital advertising—and premised on user experience.</p> +<p>But we messed up.</p> +<p>Through our pursuit of further automation and maximization of margins during the industrial age of media technology, we built advertising technology to optimize publishers’ yield of marketing budgets that had eroded after the last recession. Looking back now, our scraping of dimes may have cost us dollars in consumer loyalty. The fast, scalable systems of targeting users with ever-heftier advertisements have slowed down the public internet and drained more than a few batteries. We were so clever and so good at it that we over-engineered the capabilities of the plumbing laid down by, well, ourselves. This steamrolled the users, depleted their devices, and tried their patience.</p> +<p>The rise of ad blocking poses a threat to the internet and could potentially drive users to an enclosed platform world dominated by a few companies. We have let the fine equilibrium of content, commerce, and technology get out of balance in the open web. We had, and still do have, a responsibility to educate the business side, and in some cases to push back. We lost sight of our social and ethical responsibility to provide a safe, usable experience for anyone and everyone wanting to consume the content of their choice.</p> +<p>We need to bring that back into alignment, starting right now.</p> +<p><a href="http://www.iab.com/wp-content/uploads/2015/10/getting-lean-with-digital-ad-ux.jpg"><img alt="Getting LEAN with Digital Ad UX" class="alignnone size-medium wp-image-15403" height="250" src="http://www.iab.com/wp-content/uploads/2015/10/getting-lean-with-digital-ad-ux-300x250.jpg" width="300"></img></a>Today, the IAB Tech Lab is launching the L.E.A.N. Ads program. Supported by the Executive Committee of the IAB Tech Lab Board, IABs around the world, and hundreds of member companies, L.E.A.N. stands for Light, Encrypted, Ad choice supported, Non-invasive ads. These are principles that will help guide the next phases of advertising technical standards for the global digital advertising supply chain.</p> +<p>As with any other industry, standards should be created by non-profit standards-setting bodies, with many diverse voices providing input. We will invite all parties for public comment, and make sure consumer interest groups have the opportunity to provide input.</p> +<p>L.E.A.N. Ads do not replace the current advertising standards many consumers still enjoy and engage with while consuming content on our sites across all IP enabled devices. Rather, these principles will guide an alternative set of standards that provide choice for marketers, content providers, and consumers.</p> +<p>Among the many areas of concentration, we must also address frequency capping on retargeting in Ad Tech and make sure a user is targeted appropriately before, but never AFTER they make a purchase. If we are so good at reach and scale, we can be just as good, if not better, at moderation. Additionally, we must address volume of ads per page as well as continue on the path to viewability. The dependencies here are critical to an optimized user experience.</p> +<p>The consumer is demanding these actions, challenging us to do better, and we must respond.</p> +<p>The IAB Tech Lab will continue to provide the tools for publishers in the digital supply chain to have a dialogue with users about their choices so that content providers can generate revenue while creating value. Publishers should have the opportunity to provide rich advertising experiences, L.E.A.N. advertising experiences, and subscription services. Or publishers can simply deny their service to users who choose to keep on blocking ads. That is all part of elasticity of consumer tolerance and choice.</p> +<p>Finally, we must do this in an increasingly fragmented market, across screens. We must do this in environments where entire sites are blocked, purposefully or not. Yes, it is disappointing that our development efforts will have to manage with multiple frameworks while we work to supply the economic engine to sustain an open internet. However, our goal is still to provide diverse content and voices to as many connected users as possible around the world.</p> +<p>That is user experience.</p> +<p> </p> +<table><tbody><tr><td>IAB Tech Lab Members can join the IAB Tech Lab Ad Blocking Working Group, please email <a href="mailto:[email protected]">[email protected]</a> for more information.</td> +</tr></tbody></table><p>Read <a href="http://www.iab.com/insights/ad-blocking/" target="_blank">more about ad blocking here</a>.</p> + </div>
\ No newline at end of file diff --git a/test/test-pages/ietf-1/expected.html b/test/test-pages/ietf-1/expected.html index 1d538b0..525dad5 100644 --- a/test/test-pages/ietf-1/expected.html +++ b/test/test-pages/ietf-1/expected.html @@ -1,6 +1,6 @@ <div> -<span class="pre noprint docinfo top">[<a href="http://fakehost/test/../html/" title="Document search and retrieval page">Docs</a>] [<a href="https://tools.ietf.org/id/draft-dejong-remotestorage-04.txt" title="Plaintext version of this document">txt</a>|<a href="http://fakehost/pdf/draft-dejong-remotestorage-04.txt" title="PDF version of this document">pdf</a>] [<a href="https://datatracker.ietf.org/doc/draft-dejong-remotestorage" title="IESG Datatracker information for this document">Tracker</a>] [<a href="mailto:[email protected]?subject=draft-dejong-remotestorage%20" title="Send email to the document authors">Email</a>] [<a href="http://fakehost/rfcdiff?difftype=--hwdiff&url2=draft-dejong-remotestorage-04.txt" title="Inline diff (wdiff)">Diff1</a>] [<a href="http://fakehost/rfcdiff?url2=draft-dejong-remotestorage-04.txt" title="Side-by-side diff">Diff2</a>] [<a href="http://fakehost/idnits?url=https://tools.ietf.org/id/draft-dejong-remotestorage-04.txt" title="Run an idnits check of this document">Nits</a>] </span><br></br><span class="pre noprint docinfo"> </span><p><span class="pre noprint docinfo">Versions: <a href="http://fakehost/test/draft-dejong-remotestorage-00">00</a> <a href="http://fakehost/test/draft-dejong-remotestorage-01">01</a> <a href="http://fakehost/test/draft-dejong-remotestorage-02">02</a> <a href="http://fakehost/test/draft-dejong-remotestorage-03">03</a> <a href="http://fakehost/test/draft-dejong-remotestorage-04">04</a> </span><span class="pre noprint docinfo"> </span><p><pre>INTERNET DRAFT Michiel B. de Jong +<span class="pre noprint docinfo top">[<a href="http://fakehost/test/../html/" title="Document search and retrieval page">Docs</a>] [<a href="https://tools.ietf.org/id/draft-dejong-remotestorage-04.txt" title="Plaintext version of this document">txt</a>|<a href="http://fakehost/pdf/draft-dejong-remotestorage-04.txt" title="PDF version of this document">pdf</a>] [<a href="https://datatracker.ietf.org/doc/draft-dejong-remotestorage" title="IESG Datatracker information for this document">Tracker</a>] [<a href="mailto:[email protected]?subject=draft-dejong-remotestorage%20" title="Send email to the document authors">Email</a>] [<a href="http://fakehost/rfcdiff?difftype=--hwdiff&url2=draft-dejong-remotestorage-04.txt" title="Inline diff (wdiff)">Diff1</a>] [<a href="http://fakehost/rfcdiff?url2=draft-dejong-remotestorage-04.txt" title="Side-by-side diff">Diff2</a>] [<a href="http://fakehost/idnits?url=https://tools.ietf.org/id/draft-dejong-remotestorage-04.txt" title="Run an idnits check of this document">Nits</a>] </span><br></br><span class="pre noprint docinfo"> </span><p><span class="pre noprint docinfo">Versions: <a href="http://fakehost/test/draft-dejong-remotestorage-00">00</a> <a href="http://fakehost/test/draft-dejong-remotestorage-01">01</a> <a href="http://fakehost/test/draft-dejong-remotestorage-02">02</a> <a href="http://fakehost/test/draft-dejong-remotestorage-03">03</a> <a href="http://fakehost/test/draft-dejong-remotestorage-04">04</a> </span><span class="pre noprint docinfo"> </span></p><p><pre>INTERNET DRAFT Michiel B. de Jong Document: <a href="http://fakehost/test/draft-dejong-remotestorage-04">draft-dejong-remotestorage-04</a> IndieHosters F. Kooman Intended Status: Proposed Standard (independent) @@ -1107,4 +1107,4 @@ de Jong [Page 22] </pre><span class="noprint"><small><small>Html markup produced by rfcmarkup 1.111, available from <a href="https://tools.ietf.org/tools/rfcmarkup/">https://tools.ietf.org/tools/rfcmarkup/</a> </small></small></span> -</div>
\ No newline at end of file +</p></div>
\ No newline at end of file diff --git a/test/test-pages/liberation-1/expected.html b/test/test-pages/liberation-1/expected.html index 2b9b909..cedbffa 100644 --- a/test/test-pages/liberation-1/expected.html +++ b/test/test-pages/liberation-1/expected.html @@ -1,17 +1,12 @@ -<div id="readability-page-1" class="page"> - <section id="news-article"> - <article itemscope="" itemtype="http://schema.org/NewsArticle"> - <div class="article-body mod" itemprop="articleBody" id="article-body"> - <div> - <p>Un troisième Français a été tué dans le tremblement de terre samedi au Népal, emporté par une avalanche, <a href="http://www.liberation.fr/video/2015/04/30/laurent-fabius-plus-de-200-francais-n-ont-pas-ete-retrouves_1278687" target="_blank">a déclaré jeudi le ministre des Affaires étrangères</a>. Les autorités françaises sont toujours sans nouvelles <em>«d’encore plus de 200» </em>personnes. <em>«Pour certains d’entre eux on est très interrogatif»</em>, a ajouté Laurent Fabius. Il accueillait à Roissy un premier avion spécial ramenant des rescapés. <a href="http://www.liberation.fr/video/2015/04/30/seisme-au-nepal-soulages-mais-inquiets-206-survivants-de-retour-en-france_1278758" target="_blank">L’Airbus A350 affrété par les autorités françaises s’est posé peu avant 5h45</a> avec à son bord 206 passagers, dont 12 enfants et 26 blessés, selon une source du Quai d’Orsay. Quasiment tous sont français, à l’exception d’une quinzaine de ressortissants allemands, suisses, italiens, portugais ou encore turcs. Des psychologues, une équipe médicale et des personnels du centre de crise du Quai d’Orsay les attendent.</p> - <p>L’appareil, mis à disposition par Airbus, était arrivé à Katmandou mercredi matin avec 55 personnels de santé et humanitaires, ainsi que 25 tonnes de matériel (abris, médicaments, aide alimentaire). Un deuxième avion dépêché par Paris, qui était immobilisé aux Emirats depuis mardi avec 20 tonnes de matériel, est arrivé jeudi à Katmandou, <a href="http://www.liberation.fr/monde/2015/04/29/embouteillages-et-retards-a-l-aeroport-de-katmandou_1276612" target="_blank">dont le petit aéroport est engorgé</a> par le trafic et l’afflux d’aide humanitaire. Il devait lui aussi ramener des Français, <em>«les plus éprouvés»</em> par la catastrophe et les <em>«plus vulnérables (blessés, familles avec enfants)»</em>, selon le ministère des Affaires étrangères.</p> - <p>2 209 Français ont été localisés sains et saufs tandis que 393 n’ont pas encore pu être joints, selon le Quai d’Orsay. Environ 400 Français ont demandé à être rapatriés dans les vols mis en place par la France.</p> - <p>Le séisme a fait près de 5 500 morts et touche huit des 28 millions d’habitants du Népal. Des dizaines de milliers de personnes sont sans abri.</p> - <p> - <iframe src="http://www.dailymotion.com/embed/video/x2oikl3" frameborder="0" width="100%" data-aspect-ratio="0.5625" data-responsive="1"></iframe> - <br/><em></em></p> - </div> - </div> - </article> - </section> -</div>
\ No newline at end of file +<div class="article-body mod" id="article-body" itemprop="articleBody"> + <div> + <p>Un troisième Français a été tué dans le tremblement de terre samedi au Népal, emporté par une avalanche, <a href="http://www.liberation.fr/video/2015/04/30/laurent-fabius-plus-de-200-francais-n-ont-pas-ete-retrouves_1278687" target="_blank">a déclaré jeudi le ministre des Affaires étrangères</a>. Les autorités françaises sont toujours sans nouvelles <em>«d’encore plus de 200» </em>personnes. <em>«Pour certains d’entre eux on est très interrogatif»</em>, a ajouté Laurent Fabius. Il accueillait à Roissy un premier avion spécial ramenant des rescapés. <a href="http://www.liberation.fr/video/2015/04/30/seisme-au-nepal-soulages-mais-inquiets-206-survivants-de-retour-en-france_1278758" target="_blank">L’Airbus A350 affrété par les autorités françaises s’est posé peu avant 5h45</a> avec à son bord 206 passagers, dont 12 enfants et 26 blessés, selon une source du Quai d’Orsay. Quasiment tous sont français, à l’exception d’une quinzaine de ressortissants allemands, suisses, italiens, portugais ou encore turcs. Des psychologues, une équipe médicale et des personnels du centre de crise du Quai d’Orsay les attendent.</p> + <p>L’appareil, mis à disposition par Airbus, était arrivé à Katmandou mercredi matin avec 55 personnels de santé et humanitaires, ainsi que 25 tonnes de matériel (abris, médicaments, aide alimentaire). Un deuxième avion dépêché par Paris, qui était immobilisé aux Emirats depuis mardi avec 20 tonnes de matériel, est arrivé jeudi à Katmandou, <a href="http://www.liberation.fr/monde/2015/04/29/embouteillages-et-retards-a-l-aeroport-de-katmandou_1276612" target="_blank">dont le petit aéroport est engorgé</a> par le trafic et l’afflux d’aide humanitaire. Il devait lui aussi ramener des Français, <em>«les plus éprouvés»</em> par la catastrophe et les <em>«plus vulnérables (blessés, familles avec enfants)»</em>, selon le ministère des Affaires étrangères.</p> + <p>2 209 Français ont été localisés sains et saufs tandis que 393 n’ont pas encore pu être joints, selon le Quai d’Orsay. Environ 400 Français ont demandé à être rapatriés dans les vols mis en place par la France.</p> + <p>Le séisme a fait près de 5 500 morts et touche huit des 28 millions d’habitants du Népal. Des dizaines de milliers de personnes sont sans abri.</p> + <p> + <iframe data-aspect-ratio="0.5625" data-responsive="1" frameborder="0" src="http://www.dailymotion.com/embed/video/x2oikl3" width="100%"></iframe> + <br></br><em></em></p> + </div> + + </div>
\ No newline at end of file diff --git a/test/test-pages/lwn-1/expected.html b/test/test-pages/lwn-1/expected.html index 4b6ec34..15ec81b 100644 --- a/test/test-pages/lwn-1/expected.html +++ b/test/test-pages/lwn-1/expected.html @@ -1,581 +1,377 @@ -<div id="readability-page-1" class="page"> - <div> - <td class="MidColumn"> - <div class="ArticleText"> - <h2 class="SummaryHL"><a href="http://fakehost/Articles/637755/">A trademark battle in the Arduino community</a></h2> - <p>The <a href="https://en.wikipedia.org/wiki/Arduino">Arduino</a> has been one of the biggest success stories of the open-hardware movement, but that success does not protect it from internal conflict. In recent months, two of the project's founders have come into conflict about the direction of future efforts—and that conflict has turned into a legal dispute about who owns the rights to the Arduino trademark. </p> - <p>The current fight is a battle between two companies that both bear the Arduino name: Arduino LLC and Arduino SRL. The disagreements that led to present state of affairs go back a bit further. </p> - <p>The Arduino project grew out of 2005-era course work taught at the Interaction Design Institute Ivrea (IDII) in Ivrea, Italy (using <a href="https://en.wikipedia.org/wiki/Processing_(programming_language)">Processing</a>, <a href="https://en.wikipedia.org/wiki/Wiring_%28development_platform%29">Wiring</a>, and pre-existing microcontroller hardware). After the IDII program was discontinued, the open-hardware Arduino project as we know it was launched by Massimo Banzi, David Cuartielles, and David Mellis (who had worked together at IDII), with co-founders Tom Igoe and Gianluca Martino joining shortly afterward. The project released open hardware designs (including full schematics and design files) as well as the microcontroller software to run on the boards and the desktop IDE needed to program it. </p> - <p>Arduino LLC was incorporated in 2008 by Banzi, Cuartielles, Mellis, Igoe, and Martino. The company is registered in the United States, and it has continued to design the Arduino product line, develop the software, and run the Arduino community site. The hardware devices themselves, however, were manufactured by a separate company, "Smart Projects SRL," that was founded by Martino. "SRL" is essentially the Italian equivalent of "LLC"—Smart Projects was incorporated in Italy. </p> - <p>This division of responsibilities—with the main Arduino project handling everything except for board manufacturing—may seem like an odd one, but it is consistent with Arduino's marketing story. From its earliest days, the designs for the hardware have been freely available, and outside companies were allowed to make Arduino-compatible devices. The project has long run a <a href="http://arduino.cc/en/ArduinoCertified/Products#program">certification +<div><td class="MidColumn"> + + <div class="ArticleText"> + <h2 class="SummaryHL"><a href="http://fakehost/Articles/637755/">A trademark battle in the Arduino community</a></h2> + + <p>The <a href="https://en.wikipedia.org/wiki/Arduino">Arduino</a> has been one of the biggest success stories of the open-hardware movement, but that success does not protect it from internal conflict. In recent months, two of the project's founders have come into conflict about the direction of future efforts—and that conflict has turned into a legal dispute about who owns the rights to the Arduino trademark. </p> + <p>The current fight is a battle between two companies that both bear the Arduino name: Arduino LLC and Arduino SRL. The disagreements that led to present state of affairs go back a bit further. </p> + <p>The Arduino project grew out of 2005-era course work taught at the Interaction Design Institute Ivrea (IDII) in Ivrea, Italy (using <a href="https://en.wikipedia.org/wiki/Processing_(programming_language)">Processing</a>, <a href="https://en.wikipedia.org/wiki/Wiring_%28development_platform%29">Wiring</a>, and pre-existing microcontroller hardware). After the IDII program was discontinued, the open-hardware Arduino project as we know it was launched by Massimo Banzi, David Cuartielles, and David Mellis (who had worked together at IDII), with co-founders Tom Igoe and Gianluca Martino joining shortly afterward. The project released open hardware designs (including full schematics and design files) as well as the microcontroller software to run on the boards and the desktop IDE needed to program it. </p> + <p>Arduino LLC was incorporated in 2008 by Banzi, Cuartielles, Mellis, Igoe, and Martino. The company is registered in the United States, and it has continued to design the Arduino product line, develop the software, and run the Arduino community site. The hardware devices themselves, however, were manufactured by a separate company, "Smart Projects SRL," that was founded by Martino. "SRL" is essentially the Italian equivalent of "LLC"—Smart Projects was incorporated in Italy. </p> + <p>This division of responsibilities—with the main Arduino project handling everything except for board manufacturing—may seem like an odd one, but it is consistent with Arduino's marketing story. From its earliest days, the designs for the hardware have been freely available, and outside companies were allowed to make Arduino-compatible devices. The project has long run a <a href="http://arduino.cc/en/ArduinoCertified/Products#program">certification program</a> for third-party manufacturers interested in using the "Arduino" branding, but allows (and arguably even encourages) informal software and firmware compatibility. </p> - <p>The Arduino branding was not formally registered as a trademark in the early days, however. Arduino LLC <a href="http://tsdr.uspto.gov/#caseNumber=3931675&caseType=US_REGISTRATION_NO&searchType=statusSearch">filed</a> to register the US trademark in April 2009, and it was granted in 2011. </p> - <p>At this point, the exact events begin to be harder to verify, but the original group of founders reportedly had a difference of opinion about how to license out hardware production rights to other companies. Wired Italy <a href="http://www.wired.it/gadget/computer/2015/02/12/arduino-nel-caos-situazione/">reports</a> that Martino and Smart Projects resisted the other four founders' plans to "internationalize" production—although it is not clear if that meant that Smart Projects disapproved of licensing out <em>any</em> official hardware manufacturing to other companies, or had some other concern. Heise Online <a href="http://www.heise.de/make/meldung/Arduino-gegen-Arduino-Gruender-streiten-um-die-Firma-2549653.html">adds</a> that the conflict seemed to be about moving some production to China. </p> - <p>What is clear is that Smart Projects filed a <a href="http://ttabvue.uspto.gov/ttabvue/v?pno=92060077&pty=CAN&eno=1">petition</a> with the US Patent and Trademark Office (USPTO) in October 2014 asking the USPTO to cancel Arduino LLC's trademark on "Arduino." Then, in November 2014, Smart Projects changed its company's name to Arduino SRL. Somewhere around that time, Martino sold off his ownership stake in Smart Projects SRL and new owner Federico Musto was named CEO. </p> - <p>Unsurprisingly, Arduino LLC did not care for the petition to the USPTO and, in January 2015, the company filed a trademark-infringement <a href="http://dockets.justia.com/docket/massachusetts/madce/1:2015cv10181/167131">lawsuit</a> against Arduino SRL. Confusing matters further, the re-branded Arduino SRL has set up its own web site using the domain name <tt>arduino.org</tt>, which duplicates most of the site features found on the original Arduino site (<tt>arduino.cc</tt>). That includes both a hardware store and software downloads. </p> - <p>Musto, the new CEO of the company now called Arduino SRL, has a bit of a history with Arduino as well. His other manufacturing business had <a href="http://www.eetimes.com/document.asp?doc_id=1263246">collaborated</a> with Arduino LLC on the design and production of the Arduino Yún, which has received some <a href="http://hackaday.com/2015/02/24/is-the-arduino-yun-open-hardware/">criticism</a> for including proprietary components. </p> - <p>Hackaday has run a two-part series (in <a href="http://hackaday.com/2015/02/25/arduino-v-arduino/">February</a> and <a href="http://hackaday.com/2015/03/12/arduino-v-arduino-part-ii/">March</a>) digging into the ins and outs of the dispute, including the suggestion that Arduino LLC's recent release of version 1.6.0 of the Arduino IDE was a move intended to block Arduino SRL from hijacking IDE development. Commenter Paul Stoffregen (who was the author of the Heise story above) <a href="http://hackaday.com/2015/02/25/arduino-v-arduino/comment-page-1/#comment-2453084">noted</a> that Arduino SRL recently created a fork of the Arduino IDE on GitHub. </p> - <p>Most recently, Banzi broke his silence about the dispute in a <a href="http://makezine.com/2015/03/19/massimo-banzi-fighting-for-arduino">story</a> published at MAKEzine. There, Banzi claims that Martino secretly filed a trademark application on "Arduino" in Italy in 2008 and told none of the other Arduino founders. He also details a series of unpleasant negotiations between the companies, including Smart Projects stopping the royalty payments it had long sent to Arduino LLC for manufacturing devices and re-branding its boards with the Arduino.org URL. </p> - <p>Users appear to be stuck in the middle. Banzi says that several retail outlets that claim to be selling "official" Arduino boards are actually paying Arduino SRL, not Arduino LLC, but it is quite difficult to determine which retailers are lined up on which side, since there are (typically) several levels of supplier involved. The two Arduino companies' web sites also disagree about the available hardware, with Arduino.org offering the new <a href="http://arduino.org/products/arduino-zero-pro">Arduino Zero</a> model for sale today and Arduino.cc <a href="http://arduino.cc/en/Main/Products">listing it</a> as "Coming soon." </p> - <p>Furthermore, as Hackaday's March story explains, the recently-released Arduino.cc IDE now reports that boards manufactured by Arduino SRL are "uncertified." That warning does not prevent users from programming the other company's hardware, but it will no doubt confuse quite a few users who believe they possess genuine Arduino-manufactured devices. </p> - <p>The USPTO page for Arduino SRL's petition notes pre-trial disclosure dates have been set for August and October of 2015 (for Arduino SRL and Arduino LLC, respectively), which suggests that this debate is far from over. Of course, it is always disappointing to observe a falling out between project founders, particularly when the project in question has had such an impact on open-source software and open hardware. </p> - <p>One could argue that disputes of this sort are proof that even small projects started among friends need to take legal and intellectual-property issues (such as trademarks) seriously from the very beginning—perhaps Arduino and Smart Projects thought that an informal agreement was all that was necessary in the early days, after all. </p> - <p>But, perhaps, once a project becomes profitable, there is simply no way to predict what might happen. Arduino LLC would seem to have a strong case for continual and rigorous use of the "Arduino" trademark, which is the salient point in US trademark law. It could still be a while before the courts rule on either side of that question, however. </p> - <p><a href="http://fakehost/Articles/637755/#Comments">Comments (5 posted)</a> </p> - <h2 class="SummaryHL"><a href="http://fakehost/Articles/637533/">Mapping and data mining with QGIS 2.8</a></h2> - <p class="FeatureByline"> By <b>Nathan Willis</b> - <br/>March 25, 2015 </p> - <p><a href="http://qgis.org/">QGIS</a> is a free-software geographic information system (GIS) tool; it provides a unified interface in which users can import, edit, and analyze geographic-oriented information, and it can produce output as varied as printable maps or map-based web services. The project recently made its first update to be designated a long-term release (LTR), and that release is both poised for high-end usage and friendly to newcomers alike. </p> - <p>The new release is version 2.8, which was unveiled on March 2. An official <a href="http://qgis.org/en/site/forusers/visualchangelog28/index.html">change + <p>The Arduino branding was not formally registered as a trademark in the early days, however. Arduino LLC <a href="http://tsdr.uspto.gov/#caseNumber=3931675&caseType=US_REGISTRATION_NO&searchType=statusSearch">filed</a> to register the US trademark in April 2009, and it was granted in 2011. </p> + <p>At this point, the exact events begin to be harder to verify, but the original group of founders reportedly had a difference of opinion about how to license out hardware production rights to other companies. Wired Italy <a href="http://www.wired.it/gadget/computer/2015/02/12/arduino-nel-caos-situazione/">reports</a> that Martino and Smart Projects resisted the other four founders' plans to "internationalize" production—although it is not clear if that meant that Smart Projects disapproved of licensing out <em>any</em> official hardware manufacturing to other companies, or had some other concern. Heise Online <a href="http://www.heise.de/make/meldung/Arduino-gegen-Arduino-Gruender-streiten-um-die-Firma-2549653.html">adds</a> that the conflict seemed to be about moving some production to China. </p> + <p>What is clear is that Smart Projects filed a <a href="http://ttabvue.uspto.gov/ttabvue/v?pno=92060077&pty=CAN&eno=1">petition</a> with the US Patent and Trademark Office (USPTO) in October 2014 asking the USPTO to cancel Arduino LLC's trademark on "Arduino." Then, in November 2014, Smart Projects changed its company's name to Arduino SRL. Somewhere around that time, Martino sold off his ownership stake in Smart Projects SRL and new owner Federico Musto was named CEO. </p> + <p>Unsurprisingly, Arduino LLC did not care for the petition to the USPTO and, in January 2015, the company filed a trademark-infringement <a href="http://dockets.justia.com/docket/massachusetts/madce/1:2015cv10181/167131">lawsuit</a> against Arduino SRL. Confusing matters further, the re-branded Arduino SRL has set up its own web site using the domain name <tt>arduino.org</tt>, which duplicates most of the site features found on the original Arduino site (<tt>arduino.cc</tt>). That includes both a hardware store and software downloads. </p> + <p>Musto, the new CEO of the company now called Arduino SRL, has a bit of a history with Arduino as well. His other manufacturing business had <a href="http://www.eetimes.com/document.asp?doc_id=1263246">collaborated</a> with Arduino LLC on the design and production of the Arduino Yún, which has received some <a href="http://hackaday.com/2015/02/24/is-the-arduino-yun-open-hardware/">criticism</a> for including proprietary components. </p> + <p>Hackaday has run a two-part series (in <a href="http://hackaday.com/2015/02/25/arduino-v-arduino/">February</a> and <a href="http://hackaday.com/2015/03/12/arduino-v-arduino-part-ii/">March</a>) digging into the ins and outs of the dispute, including the suggestion that Arduino LLC's recent release of version 1.6.0 of the Arduino IDE was a move intended to block Arduino SRL from hijacking IDE development. Commenter Paul Stoffregen (who was the author of the Heise story above) <a href="http://hackaday.com/2015/02/25/arduino-v-arduino/comment-page-1/#comment-2453084">noted</a> that Arduino SRL recently created a fork of the Arduino IDE on GitHub. </p> + <p>Most recently, Banzi broke his silence about the dispute in a <a href="http://makezine.com/2015/03/19/massimo-banzi-fighting-for-arduino">story</a> published at MAKEzine. There, Banzi claims that Martino secretly filed a trademark application on "Arduino" in Italy in 2008 and told none of the other Arduino founders. He also details a series of unpleasant negotiations between the companies, including Smart Projects stopping the royalty payments it had long sent to Arduino LLC for manufacturing devices and re-branding its boards with the Arduino.org URL. </p> + <p>Users appear to be stuck in the middle. Banzi says that several retail outlets that claim to be selling "official" Arduino boards are actually paying Arduino SRL, not Arduino LLC, but it is quite difficult to determine which retailers are lined up on which side, since there are (typically) several levels of supplier involved. The two Arduino companies' web sites also disagree about the available hardware, with Arduino.org offering the new <a href="http://arduino.org/products/arduino-zero-pro">Arduino Zero</a> model for sale today and Arduino.cc <a href="http://arduino.cc/en/Main/Products">listing it</a> as "Coming soon." </p> + <p>Furthermore, as Hackaday's March story explains, the recently-released Arduino.cc IDE now reports that boards manufactured by Arduino SRL are "uncertified." That warning does not prevent users from programming the other company's hardware, but it will no doubt confuse quite a few users who believe they possess genuine Arduino-manufactured devices. </p> + <p>The USPTO page for Arduino SRL's petition notes pre-trial disclosure dates have been set for August and October of 2015 (for Arduino SRL and Arduino LLC, respectively), which suggests that this debate is far from over. Of course, it is always disappointing to observe a falling out between project founders, particularly when the project in question has had such an impact on open-source software and open hardware. </p> + <p>One could argue that disputes of this sort are proof that even small projects started among friends need to take legal and intellectual-property issues (such as trademarks) seriously from the very beginning—perhaps Arduino and Smart Projects thought that an informal agreement was all that was necessary in the early days, after all. </p> + <p>But, perhaps, once a project becomes profitable, there is simply no way to predict what might happen. Arduino LLC would seem to have a strong case for continual and rigorous use of the "Arduino" trademark, which is the salient point in US trademark law. It could still be a while before the courts rule on either side of that question, however. </p> + <p><a href="http://fakehost/Articles/637755/#Comments">Comments (5 posted)</a> </p> + + <h2 class="SummaryHL"><a href="http://fakehost/Articles/637533/">Mapping and data mining with QGIS 2.8</a></h2> + <p> By <b>Nathan Willis</b> + <br></br>March 25, 2015 </p> + <p><a href="http://qgis.org/">QGIS</a> is a free-software geographic information system (GIS) tool; it provides a unified interface in which users can import, edit, and analyze geographic-oriented information, and it can produce output as varied as printable maps or map-based web services. The project recently made its first update to be designated a long-term release (LTR), and that release is both poised for high-end usage and friendly to newcomers alike. </p> + <p>The new release is version 2.8, which was unveiled on March 2. An official <a href="http://qgis.org/en/site/forusers/visualchangelog28/index.html">change log</a> is available on the QGIS site, while the release itself was announced primarily through blog posts (such as <a href="http://anitagraser.com/2015/03/02/qgis-2-8-ltr-has-landed/">this post</a> by Anita Graser of the project's steering committee). Downloads are <a href="http://qgis.org/en/site/forusers/download.html">available</a> for a variety of platforms, including packages for Ubuntu, Debian, Fedora, openSUSE, and several other distributions.</p> - <a href="http://fakehost/Articles/637747/"> <img src="http://fakehost/images/2015/03-qgis-map-sm.png" border="0" hspace="5" align="right" width="350" height="264" alt="[QGIS main interface]"/> </a> - <p>As the name might suggest, QGIS is a Qt application; the latest release will, in fact, build on both Qt4 and Qt5, although the binaries released by the project come only in Qt4 form at present. 2.8 has been labeled a long-term release (LTR)—which, in this case, means that the project has committed to providing backported bug fixes for one full calendar year, and that the 2.8.x series is in permanent feature freeze. The goal, according to the change log, is to provide a stable version suitable for businesses and deployments in other large organizations. The change log itself points out that the development of quite a few new features was underwritten by various GIS companies or university groups, which suggests that taking care of these organizations' needs is reaping dividends for the project. </p> - <p>For those new to QGIS (or GIS in general), there is a detailed new-user <a href="http://docs.qgis.org/testing/en/docs/training_manual/">tutorial</a> that provides a thorough walk-through of the data-manipulation, mapping, and analysis functions. Being a new user, I went through the tutorial; although there are a handful of minor differences between QGIS 2.8 and the version used in the text (primarily whether specific features were accessed through a toolbar or right-click menu), on the whole it is well worth the time. </p> - <p>QGIS is designed to make short work of importing spatially oriented data sets, mining information from them, and turning the results into a meaningful visualization. Technically speaking, the visualization output is optional: one could simply extract the needed statistics and results and use them to answer some question or, perhaps, publish the massaged data set as a database for others to use. </p> - <p>But well-made maps are often the easiest way to illuminate facts about populations, political regions, geography, and many other topics when human comprehension is the goal. QGIS makes importing data from databases, web-mapping services (WMS), and even unwieldy flat-file data dumps a painless experience. It handles converting between a variety of map-referencing systems more or less automatically, and allows the user to focus on finding the useful attributes of the data sets and rendering them on screen. </p> - <h4>Here be data</h4> - <p>The significant changes in QGIS 2.8 fall into several categories. There are updates to how QGIS handles the mathematical expressions and queries users can use to filter information out of a data set, improvements to the tools used to explore the on-screen map canvas, and enhancements to the "map composer" used to produce visual output. This is on top of plenty of other under-the-hood improvements, naturally.</p> - <a href="http://fakehost/Articles/637748/"> <img src="http://fakehost/images/2015/03-qgis-query-sm.png" border="0" hspace="5" align="left" width="300" height="302" alt="[QGIS query builder]"/> </a> - <p>In the first category are several updates to the filtering tools used to mine a data set. Generally speaking, each independent data set is added to a QGIS project as its own layer, then transformed with filters to focus in on a specific portion of the original data. For instance, the land-usage statistics for a region might be one layer, while roads and buildings for the same region from OpenStreetMap might be two additional layers. Such filters can be created in several ways: there is a "query builder" that lets the user construct and test expressions on a data layer, then save the results, an SQL console for performing similar queries on a database, and spreadsheet-like editing tools for working directly on data tables. </p> - <p>All three have been improved in this release. New are support for <tt>if(condition, true, false)</tt> conditional statements, a set of operations for geometry primitives (e.g., to test whether regions overlap or lines intersect), and an "integer divide" operation. Users can also add comments to their queries to annotate their code, and there is a new <a href="http://nathanw.net/2015/01/19/function-editor-for-qgis-expressions/">custom + <a href="http://fakehost/Articles/637747/"> <img align="right" alt="[QGIS main interface]" border="0" height="264" hspace="5" src="http://fakehost/images/2015/03-qgis-map-sm.png" width="350"></img></a> + <p>As the name might suggest, QGIS is a Qt application; the latest release will, in fact, build on both Qt4 and Qt5, although the binaries released by the project come only in Qt4 form at present. 2.8 has been labeled a long-term release (LTR)—which, in this case, means that the project has committed to providing backported bug fixes for one full calendar year, and that the 2.8.x series is in permanent feature freeze. The goal, according to the change log, is to provide a stable version suitable for businesses and deployments in other large organizations. The change log itself points out that the development of quite a few new features was underwritten by various GIS companies or university groups, which suggests that taking care of these organizations' needs is reaping dividends for the project. </p> + <p>For those new to QGIS (or GIS in general), there is a detailed new-user <a href="http://docs.qgis.org/testing/en/docs/training_manual/">tutorial</a> that provides a thorough walk-through of the data-manipulation, mapping, and analysis functions. Being a new user, I went through the tutorial; although there are a handful of minor differences between QGIS 2.8 and the version used in the text (primarily whether specific features were accessed through a toolbar or right-click menu), on the whole it is well worth the time. </p> + <p>QGIS is designed to make short work of importing spatially oriented data sets, mining information from them, and turning the results into a meaningful visualization. Technically speaking, the visualization output is optional: one could simply extract the needed statistics and results and use them to answer some question or, perhaps, publish the massaged data set as a database for others to use. </p> + <p>But well-made maps are often the easiest way to illuminate facts about populations, political regions, geography, and many other topics when human comprehension is the goal. QGIS makes importing data from databases, web-mapping services (WMS), and even unwieldy flat-file data dumps a painless experience. It handles converting between a variety of map-referencing systems more or less automatically, and allows the user to focus on finding the useful attributes of the data sets and rendering them on screen. </p> + <h4>Here be data</h4> + <p>The significant changes in QGIS 2.8 fall into several categories. There are updates to how QGIS handles the mathematical expressions and queries users can use to filter information out of a data set, improvements to the tools used to explore the on-screen map canvas, and enhancements to the "map composer" used to produce visual output. This is on top of plenty of other under-the-hood improvements, naturally.</p> + <a href="http://fakehost/Articles/637748/"> <img align="left" alt="[QGIS query builder]" border="0" height="302" hspace="5" src="http://fakehost/images/2015/03-qgis-query-sm.png" width="300"></img></a> + <p>In the first category are several updates to the filtering tools used to mine a data set. Generally speaking, each independent data set is added to a QGIS project as its own layer, then transformed with filters to focus in on a specific portion of the original data. For instance, the land-usage statistics for a region might be one layer, while roads and buildings for the same region from OpenStreetMap might be two additional layers. Such filters can be created in several ways: there is a "query builder" that lets the user construct and test expressions on a data layer, then save the results, an SQL console for performing similar queries on a database, and spreadsheet-like editing tools for working directly on data tables. </p> + <p>All three have been improved in this release. New are support for <tt>if(condition, true, false)</tt> conditional statements, a set of operations for geometry primitives (e.g., to test whether regions overlap or lines intersect), and an "integer divide" operation. Users can also add comments to their queries to annotate their code, and there is a new <a href="http://nathanw.net/2015/01/19/function-editor-for-qgis-expressions/">custom function editor</a> for writing Python functions that can be called in mathematical expressions within the query builder. </p> - <p>It is also now possible to select only some rows in a table, then perform calculations just on the selection—previously, users would have to extract the rows of interest into a new table first. Similarly, in the SQL editor, the user can highlight a subset of the SQL query and execute it separately, which is no doubt helpful for debugging. </p> - <p>There have also been several improvements to the Python and Processing plugins. Users can now drag-and-drop Python scripts onto QGIS and they will be run automatically. Several new analysis algorithms are now available through the Processing interface that were previously Python-only; they include algorithms for generating grids of points or vectors within a region, splitting layers and lines, generating <a href="http://en.wikipedia.org/wiki/Hypsometric_curve">hypsometric + <p>It is also now possible to select only some rows in a table, then perform calculations just on the selection—previously, users would have to extract the rows of interest into a new table first. Similarly, in the SQL editor, the user can highlight a subset of the SQL query and execute it separately, which is no doubt helpful for debugging. </p> + <p>There have also been several improvements to the Python and Processing plugins. Users can now drag-and-drop Python scripts onto QGIS and they will be run automatically. Several new analysis algorithms are now available through the Processing interface that were previously Python-only; they include algorithms for generating grids of points or vectors within a region, splitting layers and lines, generating <a href="http://en.wikipedia.org/wiki/Hypsometric_curve">hypsometric curves</a>, refactoring data sets, and more. </p> - <h4>Maps in, maps out</h4> - <a href="http://fakehost/Articles/637749/"> <img src="http://fakehost/images/2015/03-qgis-simplify-sm.png" border="0" hspace="5" align="right" width="300" height="303" alt="[QGIS simplify tool]"/> </a> - <p>The process of working with on-screen map data picked up some improvements in the new release as well. Perhaps the most fundamental is that each map layer added to the canvas is now handled in its own thread, so fewer hangs in the user interface are experienced when re-rendering a layer (as happens whenever the user changes the look of points or shapes in a layer). Since remote databases can also be layers, this multi-threaded approach is more resilient against connectivity problems, too. The interface also now supports temporary "scratch" layers that can be used to merge, filter, or simply experiment with a data set, but are not saved when the current project is saved. </p> - <p>For working on the canvas itself, polygonal regions can now use raster images (tiled, if necessary) as fill colors, the map itself can be rotated arbitrarily, and objects can be "snapped" to align with items on any layer (not just the current layer). For working with raster image layers (e.g., aerial photographs) or simply creating new geometric shapes by hand, there is a new digitizing tool that can offer assistance by locking lines to specific angles, automatically keeping borders parallel, and other niceties. </p> - <p>There is a completely overhauled "simplify" tool that is used to reduce the number of extraneous vertices of a vector layer (thus reducing its size). The old simplify tool provided only a relative "tolerance" setting that did not correspond directly to any units. With the new tool, users can set a simplification threshold in terms of the underlying map units, layer-specific units, pixels, and more—and, in addition, the tool reports how much the simplify operation has reduced the size of the data.</p> - <a href="http://fakehost/Articles/637751/"> <img src="http://fakehost/images/2015/03-qgis-style-sm.png" border="0" hspace="5" align="left" width="300" height="286" alt="[QGIS style editing]"/> </a> - <p>There has also been an effort to present a uniform interface to one of the most important features of the map canvas: the ability to change the symbology used for an item based on some data attribute. The simplest example might be to change the line color of a road based on whether its road-type attribute is "highway," "service road," "residential," or so on. But the same feature is used to automatically highlight layer information based on the filtering and querying functionality discussed above. The new release allows many more map attributes to be controlled by these "data definition" settings, and provides a hard-to-miss button next to each attribute, through which a custom data definition can be set. </p> - <p>QGIS's composer module is the tool used to take project data and generate a map that can be used outside of the application (in print, as a static image, or as a layer for <a href="http://mapserver.org/">MapServer</a> or some other software tool, for example). Consequently, it is not a simple select-and-click-export tool; composing the output can involve a lot of choices about which data to make visible, how (and where) to label it, and how to make it generally accessible. </p> - <p>The updated composer in 2.8 now has a full-screen mode and sports several new options for configuring output. For instance, the user now has full control over how map axes are labeled. In previous releases, the grid coordinates of the map could be turned on or off, but the only options were all or nothing. Now, the user can individually choose whether coordinates are displayed on all four sides, and can even choose in which direction vertical text labels will run (so that they can be correctly justified to the edge of the map, for example). </p> - <p>There are, as usual, many more changes than there is room to discuss. Some particularly noteworthy improvements include the ability to save and load bookmarks for frequently used data sources (perhaps most useful for databases, web services, and other non-local data) and improvements to QGIS's server module. This module allows one QGIS instance to serve up data accessible to other QGIS applications (for example, to simply team projects). The server can now be extended with Python plugins and the data layers that it serves can be styled with style rules like those used in the desktop interface. </p> - <p>QGIS is one of those rare free-software applications that is both powerful enough for high-end work and yet also straightforward to use for the simple tasks that might attract a newcomer to GIS in the first place. The 2.8 release, particularly with its project-wide commitment to long-term support, appears to be an update well worth checking out, whether one needs to create a simple, custom map or to mine a database for obscure geo-referenced meaning. </p> - <p><a href="http://fakehost/Articles/637533/#Comments">Comments (3 posted)</a> </p> - <h2 class="SummaryHL"><a href="http://fakehost/Articles/637735/">Development activity in LibreOffice and OpenOffice</a></h2> - <p class="FeatureByline"> By <b>Jonathan Corbet</b> - <br/>March 25, 2015 </p> - <p style="display: inline;" class="readability-styled"> The LibreOffice project was </p><a href="http://fakehost/Articles/407383/">announced</a> - <p style="display: inline;" class="readability-styled"> with great fanfare in September 2010. Nearly one year later, the OpenOffice.org project (from which LibreOffice was forked) </p><a href="http://fakehost/Articles/446093/">was -cut loose from Oracle</a> - <p style="display: inline;" class="readability-styled"> and found a new home as an Apache project. It is fair to say that the rivalry between the two projects in the time since then has been strong. Predictions that one project or the other would fail have not been borne out, but that does not mean that the two projects are equally successful. A look at the two projects' development communities reveals some interesting differences. </p> - <h4>Release histories</h4> - <p> Apache OpenOffice has made two releases in the past year: <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce">4.1</a> in April 2014 and <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1">4.1.1</a> (described as "a micro update" in the release announcement) in August. The main feature added during that time would appear to be significantly improved accessibility support. </p> - <p> The release history for LibreOffice tells a slightly different story: </p> - <blockquote> </blockquote> - <p> It seems clear that LibreOffice has maintained a rather more frenetic release cadence, generally putting out at least one release per month. The project typically keeps at least two major versions alive at any one time. Most of the releases are of the minor, bug-fix variety, but there have been two major releases in the last year as well. </p> - <h4>Development statistics</h4> - <p> In the one-year period since late March 2014, there have been 381 changesets committed to the OpenOffice Subversion repository. The most active committers are: </p> - <blockquote> - <table> - <tbody> - <tr> - <th colspan="2" align="center">Most active OpenOffice developers</th> - </tr> - <tr> - <td width="50%" valign="top"> - <table cellspacing="3"> - <tbody> - <tr> - <th colspan="3">By changesets</th> - </tr> - <tr class="Even"> - <td>Herbert Dürr</td> - <td align="right">63</td> - <td align="right">16.6%</td> - </tr> - <tr class="Odd"> - <td>Jürgen Schmidt </td> - <td align="right">56</td> - <td align="right">14.7%</td> - </tr> - <tr class="Even"> - <td>Armin Le Grand</td> - <td align="right">56</td> - <td align="right">14.7%</td> - </tr> - <tr class="Odd"> - <td>Oliver-Rainer Wittmann</td> - <td align="right">46</td> - <td align="right">12.1%</td> - </tr> - <tr class="Even"> - <td>Tsutomu Uchino</td> - <td align="right">33</td> - <td align="right">8.7%</td> - </tr> - <tr class="Odd"> - <td>Kay Schenk</td> - <td align="right">27</td> - <td align="right">7.1%</td> - </tr> - <tr class="Even"> - <td>Pedro Giffuni</td> - <td align="right">23</td> - <td align="right">6.1%</td> - </tr> - <tr class="Odd"> - <td>Ariel Constenla-Haile</td> - <td align="right">22</td> - <td align="right">5.8%</td> - </tr> - <tr class="Even"> - <td>Andrea Pescetti</td> - <td align="right">14</td> - <td align="right">3.7%</td> - </tr> - <tr class="Odd"> - <td>Steve Yin</td> - <td align="right">11</td> - <td align="right">2.9%</td> - </tr> - <tr class="Even"> - <td>Andre Fischer</td> - <td align="right">10</td> - <td align="right">2.6%</td> - </tr> - <tr class="Odd"> - <td>Yuri Dario</td> - <td align="right">7</td> - <td align="right">1.8%</td> - </tr> - <tr class="Even"> - <td>Regina Henschel</td> - <td align="right">6</td> - <td align="right">1.6%</td> - </tr> - <tr class="Odd"> - <td>Juan C. Sanz</td> - <td align="right">2</td> - <td align="right">0.5%</td> - </tr> - <tr class="Even"> - <td>Clarence Guo</td> - <td align="right">2</td> - <td align="right">0.5%</td> - </tr> - <tr class="Odd"> - <td>Tal Daniel</td> - <td align="right">2</td> - <td align="right">0.5%</td> - </tr> - </tbody> - </table> - </td> - <td width="50%" valign="top"> - <table cellspacing="3"> - <tbody> - <tr> - <th colspan="3">By changed lines</th> - </tr> - <tr class="Even"> - <td>Jürgen Schmidt </td> - <td align="right">455499</td> - <td align="right">88.1%</td> - </tr> - <tr class="Odd"> - <td>Andre Fischer</td> - <td align="right">26148</td> - <td align="right">3.8%</td> - </tr> - <tr class="Even"> - <td>Pedro Giffuni</td> - <td align="right">23183</td> - <td align="right">3.4%</td> - </tr> - <tr class="Odd"> - <td>Armin Le Grand</td> - <td align="right">11018</td> - <td align="right">1.6%</td> - </tr> - <tr class="Even"> - <td>Juan C. Sanz</td> - <td align="right">4582</td> - <td align="right">0.7%</td> - </tr> - <tr class="Odd"> - <td>Oliver-Rainer Wittmann</td> - <td align="right">4309</td> - <td align="right">0.6%</td> - </tr> - <tr class="Even"> - <td>Andrea Pescetti</td> - <td align="right">3908</td> - <td align="right">0.6%</td> - </tr> - <tr class="Odd"> - <td>Herbert Dürr</td> - <td align="right">2811</td> - <td align="right">0.4%</td> - </tr> - <tr class="Even"> - <td>Tsutomu Uchino</td> - <td align="right">1991</td> - <td align="right">0.3%</td> - </tr> - <tr class="Odd"> - <td>Ariel Constenla-Haile</td> - <td align="right">1258</td> - <td align="right">0.2%</td> - </tr> - <tr class="Even"> - <td>Steve Yin</td> - <td align="right">1010</td> - <td align="right">0.1%</td> - </tr> - <tr class="Odd"> - <td>Kay Schenk</td> - <td align="right">616</td> - <td align="right">0.1%</td> - </tr> - <tr class="Even"> - <td>Regina Henschel</td> - <td align="right">417</td> - <td align="right">0.1%</td> - </tr> - <tr class="Odd"> - <td>Yuri Dario</td> - <td align="right">268</td> - <td align="right">0.0%</td> - </tr> - <tr class="Even"> - <td>tal</td> - <td align="right">16</td> - <td align="right">0.0%</td> - </tr> - <tr class="Odd"> - <td>Clarence Guo</td> - <td align="right">11</td> - <td align="right">0.0%</td> - </tr> - </tbody> - </table> - </td> - </tr> - </tbody> - </table> - </blockquote> - <p> In truth, the above list is not just the most active OpenOffice developers — it is all of them; a total of 16 developers have committed changes to OpenOffice in the last year. Those developers changed 528,000 lines of code, but, as can be seen above, Jürgen Schmidt accounted for the bulk of those changes, which were mostly updates to translation files. </p> - <p> The top four developers in the "by changesets" column all work for IBM, so IBM is responsible for a minimum of about 60% of the changes to OpenOffice in the last year. </p> - <p> The picture for LibreOffice is just a little bit different; in the same one-year period, the project has committed 22,134 changesets from 268 developers. The most active of these developers were: </p> - <blockquote> - <table> - <tbody> - <tr> - <th colspan="2" align="center">Most active LibreOffice developers</th> - </tr> - <tr> - <td width="50%" valign="top"> - <table cellspacing="3"> - <tbody> - <tr> - <th colspan="3">By changesets</th> - </tr> - <tr class="Even"> - <td>Caolán McNamara</td> - <td align="right">4307</td> - <td align="right">19.5%</td> - </tr> - <tr class="Odd"> - <td>Stephan Bergmann</td> - <td align="right">2351</td> - <td align="right">10.6%</td> - </tr> - <tr class="Even"> - <td>Miklos Vajna</td> - <td align="right">1449</td> - <td align="right">6.5%</td> - </tr> - <tr class="Odd"> - <td>Tor Lillqvist</td> - <td align="right">1159</td> - <td align="right">5.2%</td> - </tr> - <tr class="Even"> - <td>Noel Grandin</td> - <td align="right">1064</td> - <td align="right">4.8%</td> - </tr> - <tr class="Odd"> - <td>Markus Mohrhard</td> - <td align="right">935</td> - <td align="right">4.2%</td> - </tr> - <tr class="Even"> - <td>Michael Stahl</td> - <td align="right">915</td> - <td align="right">4.1%</td> - </tr> - <tr class="Odd"> - <td>Kohei Yoshida</td> - <td align="right">755</td> - <td align="right">3.4%</td> - </tr> - <tr class="Even"> - <td>Tomaž Vajngerl</td> - <td align="right">658</td> - <td align="right">3.0%</td> - </tr> - <tr class="Odd"> - <td>Thomas Arnhold</td> - <td align="right">619</td> - <td align="right">2.8%</td> - </tr> - <tr class="Even"> - <td>Jan Holesovsky</td> - <td align="right">466</td> - <td align="right">2.1%</td> - </tr> - <tr class="Odd"> - <td>Eike Rathke</td> - <td align="right">457</td> - <td align="right">2.1%</td> - </tr> - <tr class="Even"> - <td>Matteo Casalin</td> - <td align="right">442</td> - <td align="right">2.0%</td> - </tr> - <tr class="Odd"> - <td>Bjoern Michaelsen</td> - <td align="right">421</td> - <td align="right">1.9%</td> - </tr> - <tr class="Even"> - <td>Chris Sherlock</td> - <td align="right">396</td> - <td align="right">1.8%</td> - </tr> - <tr class="Odd"> - <td>David Tardon</td> - <td align="right">386</td> - <td align="right">1.7%</td> - </tr> - <tr class="Even"> - <td>Julien Nabet</td> - <td align="right">362</td> - <td align="right">1.6%</td> - </tr> - <tr class="Odd"> - <td>Zolnai Tamás</td> - <td align="right">338</td> - <td align="right">1.5%</td> - </tr> - <tr class="Even"> - <td>Matúš Kukan</td> - <td align="right">256</td> - <td align="right">1.2%</td> - </tr> - <tr class="Odd"> - <td>Robert Antoni Buj Gelonch</td> - <td align="right">231</td> - <td align="right">1.0%</td> - </tr> - </tbody> - </table> - </td> - <td width="50%" valign="top"> - <table cellspacing="3"> - <tbody> - <tr> - <th colspan="3">By changed lines</th> - </tr> - <tr class="Even"> - <td>Lionel Elie Mamane</td> - <td align="right">244062</td> - <td align="right">12.5%</td> - </tr> - <tr class="Odd"> - <td>Noel Grandin</td> - <td align="right">238711</td> - <td align="right">12.2%</td> - </tr> - <tr class="Even"> - <td>Stephan Bergmann</td> - <td align="right">161220</td> - <td align="right">8.3%</td> - </tr> - <tr class="Odd"> - <td>Miklos Vajna</td> - <td align="right">129325</td> - <td align="right">6.6%</td> - </tr> - <tr class="Even"> - <td>Caolán McNamara</td> - <td align="right">97544</td> - <td align="right">5.0%</td> - </tr> - <tr class="Odd"> - <td>Tomaž Vajngerl</td> - <td align="right">69404</td> - <td align="right">3.6%</td> - </tr> - <tr class="Even"> - <td>Tor Lillqvist</td> - <td align="right">59498</td> - <td align="right">3.1%</td> - </tr> - <tr class="Odd"> - <td>Laurent Balland-Poirier</td> - <td align="right">52802</td> - <td align="right">2.7%</td> - </tr> - <tr class="Even"> - <td>Markus Mohrhard</td> - <td align="right">50509</td> - <td align="right">2.6%</td> - </tr> - <tr class="Odd"> - <td>Kohei Yoshida</td> - <td align="right">45514</td> - <td align="right">2.3%</td> - </tr> - <tr class="Even"> - <td>Chris Sherlock</td> - <td align="right">36788</td> - <td align="right">1.9%</td> - </tr> - <tr class="Odd"> - <td>Peter Foley</td> - <td align="right">34305</td> - <td align="right">1.8%</td> - </tr> - <tr class="Even"> - <td>Christian Lohmaier</td> - <td align="right">33787</td> - <td align="right">1.7%</td> - </tr> - <tr class="Odd"> - <td>Thomas Arnhold</td> - <td align="right">32722</td> - <td align="right">1.7%</td> - </tr> - <tr class="Even"> - <td>David Tardon</td> - <td align="right">21681</td> - <td align="right">1.1%</td> - </tr> - <tr class="Odd"> - <td>David Ostrovsky</td> - <td align="right">21620</td> - <td align="right">1.1%</td> - </tr> - <tr class="Even"> - <td>Jan Holesovsky</td> - <td align="right">20792</td> - <td align="right">1.1%</td> - </tr> - <tr class="Odd"> - <td>Valentin Kettner</td> - <td align="right">20526</td> - <td align="right">1.1%</td> - </tr> - <tr class="Even"> - <td>Robert Antoni Buj Gelonch</td> - <td align="right">20447</td> - <td align="right">1.0%</td> - </tr> - <tr class="Odd"> - <td>Michael Stahl</td> - <td align="right">18216</td> - <td align="right">0.9%</td> - </tr> - </tbody> - </table> - </td> - </tr> - </tbody> - </table> - </blockquote> - <p> To a first approximation, the top ten companies supporting LibreOffice in the last year are: </p> - <blockquote> - <table> - <tbody> - <tr> - <th colspan="3">Companies supporting LibreOffice development</th> - </tr> - <tr> - <th colspan="3">(by changesets)</th> - </tr> - <tr class="Even"> - <td>Red Hat</td> - <td align="right">8417</td> - <td align="right">38.0%</td> - </tr> - <tr class="Odd"> - <td>Collabora <strike>Multimedia</strike></td> - <td align="right">6531</td> - <td align="right">29.5%</td> - </tr> - <tr class="Even"> - <td>(Unknown)</td> - <td align="right">5126</td> - <td align="right">23.2%</td> - </tr> - <tr class="Odd"> - <td>(None)</td> - <td align="right">1490</td> - <td align="right">6.7%</td> - </tr> - <tr class="Even"> - <td>Canonical</td> - <td align="right">422</td> - <td align="right">1.9%</td> - </tr> - <tr class="Odd"> - <td>Igalia S.L.</td> - <td align="right">80</td> - <td align="right">0.4%</td> - </tr> - <tr class="Even"> - <td>Ericsson</td> - <td align="right">21</td> - <td align="right">0.1%</td> - </tr> - <tr class="Odd"> - <td>Yandex</td> - <td align="right">18</td> - <td align="right">0.1%</td> - </tr> - <tr class="Even"> - <td>FastMail.FM</td> - <td align="right">17</td> - <td align="right">0.1%</td> - </tr> - <tr class="Odd"> - <td>SUSE</td> - <td align="right">7</td> - <td align="right">0.0%</td> - </tr> - </tbody> - </table> - </blockquote> - <p> Development work on LibreOffice is thus concentrated in a small number of companies, though it is rather more spread out than OpenOffice development. It is worth noting that the LibreOffice developers with unknown affiliation, who contributed 23% of the changes, make up 82% of the developer base, so there would appear to be a substantial community of developers contributing from outside the above-listed companies. </p> - <h4>Some conclusions</h4> - <p> Last October, some <a href="http://fakehost/Articles/637742/">concerns</a> were raised on the OpenOffice list about the health of that project's community. At the time, Rob Weir <a href="http://fakehost/Articles/637743/">shrugged them off</a> as the result of a marketing effort by the LibreOffice crowd. There can be no doubt that the war of words between these two projects has gotten tiresome at times, but, looking at the above numbers, it is hard not to conclude that there is an issue that goes beyond marketing hype here. </p> - <p> In the 4½ years since its founding, the LibreOffice project has put together a community with over 250 active developers. There is support from multiple companies and an impressive rate of patches going into the project's repository. The project's ability to sustain nearly monthly releases on two branches is a direct result of that community's work. Swearing at LibreOffice is one of your editor's favorite pastimes, but it seems clear that the project is on a solid footing with a healthy community. </p> - <p> OpenOffice, instead, is driven by four developers from a single company — a company that appears to have been deemphasizing OpenOffice work for some time. As a result, the project's commit rate is a fraction of what LibreOffice is able to sustain and releases are relatively rare. As of this writing, the <a href="https://blogs.apache.org/OOo/">OpenOffice + <h4>Maps in, maps out</h4> + <a href="http://fakehost/Articles/637749/"> <img align="right" alt="[QGIS simplify tool]" border="0" height="303" hspace="5" src="http://fakehost/images/2015/03-qgis-simplify-sm.png" width="300"></img></a> + <p>The process of working with on-screen map data picked up some improvements in the new release as well. Perhaps the most fundamental is that each map layer added to the canvas is now handled in its own thread, so fewer hangs in the user interface are experienced when re-rendering a layer (as happens whenever the user changes the look of points or shapes in a layer). Since remote databases can also be layers, this multi-threaded approach is more resilient against connectivity problems, too. The interface also now supports temporary "scratch" layers that can be used to merge, filter, or simply experiment with a data set, but are not saved when the current project is saved. </p> + <p>For working on the canvas itself, polygonal regions can now use raster images (tiled, if necessary) as fill colors, the map itself can be rotated arbitrarily, and objects can be "snapped" to align with items on any layer (not just the current layer). For working with raster image layers (e.g., aerial photographs) or simply creating new geometric shapes by hand, there is a new digitizing tool that can offer assistance by locking lines to specific angles, automatically keeping borders parallel, and other niceties. </p> + <p>There is a completely overhauled "simplify" tool that is used to reduce the number of extraneous vertices of a vector layer (thus reducing its size). The old simplify tool provided only a relative "tolerance" setting that did not correspond directly to any units. With the new tool, users can set a simplification threshold in terms of the underlying map units, layer-specific units, pixels, and more—and, in addition, the tool reports how much the simplify operation has reduced the size of the data.</p> + <a href="http://fakehost/Articles/637751/"> <img align="left" alt="[QGIS style editing]" border="0" height="286" hspace="5" src="http://fakehost/images/2015/03-qgis-style-sm.png" width="300"></img></a> + <p>There has also been an effort to present a uniform interface to one of the most important features of the map canvas: the ability to change the symbology used for an item based on some data attribute. The simplest example might be to change the line color of a road based on whether its road-type attribute is "highway," "service road," "residential," or so on. But the same feature is used to automatically highlight layer information based on the filtering and querying functionality discussed above. The new release allows many more map attributes to be controlled by these "data definition" settings, and provides a hard-to-miss button next to each attribute, through which a custom data definition can be set. </p> + <p>QGIS's composer module is the tool used to take project data and generate a map that can be used outside of the application (in print, as a static image, or as a layer for <a href="http://mapserver.org/">MapServer</a> or some other software tool, for example). Consequently, it is not a simple select-and-click-export tool; composing the output can involve a lot of choices about which data to make visible, how (and where) to label it, and how to make it generally accessible. </p> + <p>The updated composer in 2.8 now has a full-screen mode and sports several new options for configuring output. For instance, the user now has full control over how map axes are labeled. In previous releases, the grid coordinates of the map could be turned on or off, but the only options were all or nothing. Now, the user can individually choose whether coordinates are displayed on all four sides, and can even choose in which direction vertical text labels will run (so that they can be correctly justified to the edge of the map, for example). </p> + <p>There are, as usual, many more changes than there is room to discuss. Some particularly noteworthy improvements include the ability to save and load bookmarks for frequently used data sources (perhaps most useful for databases, web services, and other non-local data) and improvements to QGIS's server module. This module allows one QGIS instance to serve up data accessible to other QGIS applications (for example, to simply team projects). The server can now be extended with Python plugins and the data layers that it serves can be styled with style rules like those used in the desktop interface. </p> + <p>QGIS is one of those rare free-software applications that is both powerful enough for high-end work and yet also straightforward to use for the simple tasks that might attract a newcomer to GIS in the first place. The 2.8 release, particularly with its project-wide commitment to long-term support, appears to be an update well worth checking out, whether one needs to create a simple, custom map or to mine a database for obscure geo-referenced meaning. </p> + <p><a href="http://fakehost/Articles/637533/#Comments">Comments (3 posted)</a> </p> + + <h2 class="SummaryHL"><a href="http://fakehost/Articles/637735/">Development activity in LibreOffice and OpenOffice</a></h2> + <p> By <b>Jonathan Corbet</b> + <br></br>March 25, 2015 </p><p> The LibreOffice project was </p><a href="http://fakehost/Articles/407383/">announced</a><p> with great fanfare in September 2010. Nearly one year later, the OpenOffice.org project (from which LibreOffice was forked) </p><a href="http://fakehost/Articles/446093/">was +cut loose from Oracle</a><p> and found a new home as an Apache project. It is fair to say that the rivalry between the two projects in the time since then has been strong. Predictions that one project or the other would fail have not been borne out, but that does not mean that the two projects are equally successful. A look at the two projects' development communities reveals some interesting differences. + </p> + <h4>Release histories</h4> + <p> Apache OpenOffice has made two releases in the past year: <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce">4.1</a> in April 2014 and <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1">4.1.1</a> (described as "a micro update" in the release announcement) in August. The main feature added during that time would appear to be significantly improved accessibility support. </p> + <p> The release history for LibreOffice tells a slightly different story: </p> + + <blockquote> + </blockquote> + <p> It seems clear that LibreOffice has maintained a rather more frenetic release cadence, generally putting out at least one release per month. The project typically keeps at least two major versions alive at any one time. Most of the releases are of the minor, bug-fix variety, but there have been two major releases in the last year as well. </p> + + <h4>Development statistics</h4> + <p> In the one-year period since late March 2014, there have been 381 changesets committed to the OpenOffice Subversion repository. The most active committers are: </p> + + <blockquote> + <table><tbody><tr><th align="center" colspan="2">Most active OpenOffice developers</th> + </tr><tr><td valign="top" width="50%"> + <table cellspacing="3"><tbody><tr><th colspan="3">By changesets</th> + </tr><tr class="Even"><td>Herbert Dürr</td> + <td align="right">63</td> + <td align="right">16.6%</td> + </tr><tr class="Odd"><td>Jürgen Schmidt </td> + <td align="right">56</td> + <td align="right">14.7%</td> + </tr><tr class="Even"><td>Armin Le Grand</td> + <td align="right">56</td> + <td align="right">14.7%</td> + </tr><tr class="Odd"><td>Oliver-Rainer Wittmann</td> + <td align="right">46</td> + <td align="right">12.1%</td> + </tr><tr class="Even"><td>Tsutomu Uchino</td> + <td align="right">33</td> + <td align="right">8.7%</td> + </tr><tr class="Odd"><td>Kay Schenk</td> + <td align="right">27</td> + <td align="right">7.1%</td> + </tr><tr class="Even"><td>Pedro Giffuni</td> + <td align="right">23</td> + <td align="right">6.1%</td> + </tr><tr class="Odd"><td>Ariel Constenla-Haile</td> + <td align="right">22</td> + <td align="right">5.8%</td> + </tr><tr class="Even"><td>Andrea Pescetti</td> + <td align="right">14</td> + <td align="right">3.7%</td> + </tr><tr class="Odd"><td>Steve Yin</td> + <td align="right">11</td> + <td align="right">2.9%</td> + </tr><tr class="Even"><td>Andre Fischer</td> + <td align="right">10</td> + <td align="right">2.6%</td> + </tr><tr class="Odd"><td>Yuri Dario</td> + <td align="right">7</td> + <td align="right">1.8%</td> + </tr><tr class="Even"><td>Regina Henschel</td> + <td align="right">6</td> + <td align="right">1.6%</td> + </tr><tr class="Odd"><td>Juan C. Sanz</td> + <td align="right">2</td> + <td align="right">0.5%</td> + </tr><tr class="Even"><td>Clarence Guo</td> + <td align="right">2</td> + <td align="right">0.5%</td> + </tr><tr class="Odd"><td>Tal Daniel</td> + <td align="right">2</td> + <td align="right">0.5%</td> + </tr></tbody></table></td> + <td valign="top" width="50%"> + <table cellspacing="3"><tbody><tr><th colspan="3">By changed lines</th> + </tr><tr class="Even"><td>Jürgen Schmidt </td> + <td align="right">455499</td> + <td align="right">88.1%</td> + </tr><tr class="Odd"><td>Andre Fischer</td> + <td align="right">26148</td> + <td align="right">3.8%</td> + </tr><tr class="Even"><td>Pedro Giffuni</td> + <td align="right">23183</td> + <td align="right">3.4%</td> + </tr><tr class="Odd"><td>Armin Le Grand</td> + <td align="right">11018</td> + <td align="right">1.6%</td> + </tr><tr class="Even"><td>Juan C. Sanz</td> + <td align="right">4582</td> + <td align="right">0.7%</td> + </tr><tr class="Odd"><td>Oliver-Rainer Wittmann</td> + <td align="right">4309</td> + <td align="right">0.6%</td> + </tr><tr class="Even"><td>Andrea Pescetti</td> + <td align="right">3908</td> + <td align="right">0.6%</td> + </tr><tr class="Odd"><td>Herbert Dürr</td> + <td align="right">2811</td> + <td align="right">0.4%</td> + </tr><tr class="Even"><td>Tsutomu Uchino</td> + <td align="right">1991</td> + <td align="right">0.3%</td> + </tr><tr class="Odd"><td>Ariel Constenla-Haile</td> + <td align="right">1258</td> + <td align="right">0.2%</td> + </tr><tr class="Even"><td>Steve Yin</td> + <td align="right">1010</td> + <td align="right">0.1%</td> + </tr><tr class="Odd"><td>Kay Schenk</td> + <td align="right">616</td> + <td align="right">0.1%</td> + </tr><tr class="Even"><td>Regina Henschel</td> + <td align="right">417</td> + <td align="right">0.1%</td> + </tr><tr class="Odd"><td>Yuri Dario</td> + <td align="right">268</td> + <td align="right">0.0%</td> + </tr><tr class="Even"><td>tal</td> + <td align="right">16</td> + <td align="right">0.0%</td> + </tr><tr class="Odd"><td>Clarence Guo</td> + <td align="right">11</td> + <td align="right">0.0%</td> + </tr></tbody></table></td> + </tr></tbody></table></blockquote> + <p> In truth, the above list is not just the most active OpenOffice developers — it is all of them; a total of 16 developers have committed changes to OpenOffice in the last year. Those developers changed 528,000 lines of code, but, as can be seen above, Jürgen Schmidt accounted for the bulk of those changes, which were mostly updates to translation files. </p> + <p> The top four developers in the "by changesets" column all work for IBM, so IBM is responsible for a minimum of about 60% of the changes to OpenOffice in the last year. </p> + <p> The picture for LibreOffice is just a little bit different; in the same one-year period, the project has committed 22,134 changesets from 268 developers. The most active of these developers were: </p> + + <blockquote> + <table><tbody><tr><th align="center" colspan="2">Most active LibreOffice developers</th> + </tr><tr><td valign="top" width="50%"> + <table cellspacing="3"><tbody><tr><th colspan="3">By changesets</th> + </tr><tr class="Even"><td>Caolán McNamara</td> + <td align="right">4307</td> + <td align="right">19.5%</td> + </tr><tr class="Odd"><td>Stephan Bergmann</td> + <td align="right">2351</td> + <td align="right">10.6%</td> + </tr><tr class="Even"><td>Miklos Vajna</td> + <td align="right">1449</td> + <td align="right">6.5%</td> + </tr><tr class="Odd"><td>Tor Lillqvist</td> + <td align="right">1159</td> + <td align="right">5.2%</td> + </tr><tr class="Even"><td>Noel Grandin</td> + <td align="right">1064</td> + <td align="right">4.8%</td> + </tr><tr class="Odd"><td>Markus Mohrhard</td> + <td align="right">935</td> + <td align="right">4.2%</td> + </tr><tr class="Even"><td>Michael Stahl</td> + <td align="right">915</td> + <td align="right">4.1%</td> + </tr><tr class="Odd"><td>Kohei Yoshida</td> + <td align="right">755</td> + <td align="right">3.4%</td> + </tr><tr class="Even"><td>Tomaž Vajngerl</td> + <td align="right">658</td> + <td align="right">3.0%</td> + </tr><tr class="Odd"><td>Thomas Arnhold</td> + <td align="right">619</td> + <td align="right">2.8%</td> + </tr><tr class="Even"><td>Jan Holesovsky</td> + <td align="right">466</td> + <td align="right">2.1%</td> + </tr><tr class="Odd"><td>Eike Rathke</td> + <td align="right">457</td> + <td align="right">2.1%</td> + </tr><tr class="Even"><td>Matteo Casalin</td> + <td align="right">442</td> + <td align="right">2.0%</td> + </tr><tr class="Odd"><td>Bjoern Michaelsen</td> + <td align="right">421</td> + <td align="right">1.9%</td> + </tr><tr class="Even"><td>Chris Sherlock</td> + <td align="right">396</td> + <td align="right">1.8%</td> + </tr><tr class="Odd"><td>David Tardon</td> + <td align="right">386</td> + <td align="right">1.7%</td> + </tr><tr class="Even"><td>Julien Nabet</td> + <td align="right">362</td> + <td align="right">1.6%</td> + </tr><tr class="Odd"><td>Zolnai Tamás</td> + <td align="right">338</td> + <td align="right">1.5%</td> + </tr><tr class="Even"><td>Matúš Kukan</td> + <td align="right">256</td> + <td align="right">1.2%</td> + </tr><tr class="Odd"><td>Robert Antoni Buj Gelonch</td> + <td align="right">231</td> + <td align="right">1.0%</td> + </tr></tbody></table></td> + <td valign="top" width="50%"> + <table cellspacing="3"><tbody><tr><th colspan="3">By changed lines</th> + </tr><tr class="Even"><td>Lionel Elie Mamane</td> + <td align="right">244062</td> + <td align="right">12.5%</td> + </tr><tr class="Odd"><td>Noel Grandin</td> + <td align="right">238711</td> + <td align="right">12.2%</td> + </tr><tr class="Even"><td>Stephan Bergmann</td> + <td align="right">161220</td> + <td align="right">8.3%</td> + </tr><tr class="Odd"><td>Miklos Vajna</td> + <td align="right">129325</td> + <td align="right">6.6%</td> + </tr><tr class="Even"><td>Caolán McNamara</td> + <td align="right">97544</td> + <td align="right">5.0%</td> + </tr><tr class="Odd"><td>Tomaž Vajngerl</td> + <td align="right">69404</td> + <td align="right">3.6%</td> + </tr><tr class="Even"><td>Tor Lillqvist</td> + <td align="right">59498</td> + <td align="right">3.1%</td> + </tr><tr class="Odd"><td>Laurent Balland-Poirier</td> + <td align="right">52802</td> + <td align="right">2.7%</td> + </tr><tr class="Even"><td>Markus Mohrhard</td> + <td align="right">50509</td> + <td align="right">2.6%</td> + </tr><tr class="Odd"><td>Kohei Yoshida</td> + <td align="right">45514</td> + <td align="right">2.3%</td> + </tr><tr class="Even"><td>Chris Sherlock</td> + <td align="right">36788</td> + <td align="right">1.9%</td> + </tr><tr class="Odd"><td>Peter Foley</td> + <td align="right">34305</td> + <td align="right">1.8%</td> + </tr><tr class="Even"><td>Christian Lohmaier</td> + <td align="right">33787</td> + <td align="right">1.7%</td> + </tr><tr class="Odd"><td>Thomas Arnhold</td> + <td align="right">32722</td> + <td align="right">1.7%</td> + </tr><tr class="Even"><td>David Tardon</td> + <td align="right">21681</td> + <td align="right">1.1%</td> + </tr><tr class="Odd"><td>David Ostrovsky</td> + <td align="right">21620</td> + <td align="right">1.1%</td> + </tr><tr class="Even"><td>Jan Holesovsky</td> + <td align="right">20792</td> + <td align="right">1.1%</td> + </tr><tr class="Odd"><td>Valentin Kettner</td> + <td align="right">20526</td> + <td align="right">1.1%</td> + </tr><tr class="Even"><td>Robert Antoni Buj Gelonch</td> + <td align="right">20447</td> + <td align="right">1.0%</td> + </tr><tr class="Odd"><td>Michael Stahl</td> + <td align="right">18216</td> + <td align="right">0.9%</td> + </tr></tbody></table></td> + </tr></tbody></table></blockquote> + <p> To a first approximation, the top ten companies supporting LibreOffice in the last year are: </p> + + <blockquote> + <table><tbody><tr><th colspan="3">Companies supporting LibreOffice development</th> + </tr><tr><th colspan="3">(by changesets)</th> + </tr><tr class="Even"><td>Red Hat</td> + <td align="right">8417</td> + <td align="right">38.0%</td> + </tr><tr class="Odd"><td>Collabora <strike>Multimedia</strike></td> + <td align="right">6531</td> + <td align="right">29.5%</td> + </tr><tr class="Even"><td>(Unknown)</td> + <td align="right">5126</td> + <td align="right">23.2%</td> + </tr><tr class="Odd"><td>(None)</td> + <td align="right">1490</td> + <td align="right">6.7%</td> + </tr><tr class="Even"><td>Canonical</td> + <td align="right">422</td> + <td align="right">1.9%</td> + </tr><tr class="Odd"><td>Igalia S.L.</td> + <td align="right">80</td> + <td align="right">0.4%</td> + </tr><tr class="Even"><td>Ericsson</td> + <td align="right">21</td> + <td align="right">0.1%</td> + </tr><tr class="Odd"><td>Yandex</td> + <td align="right">18</td> + <td align="right">0.1%</td> + </tr><tr class="Even"><td>FastMail.FM</td> + <td align="right">17</td> + <td align="right">0.1%</td> + </tr><tr class="Odd"><td>SUSE</td> + <td align="right">7</td> + <td align="right">0.0%</td> + </tr></tbody></table></blockquote> + <p> Development work on LibreOffice is thus concentrated in a small number of companies, though it is rather more spread out than OpenOffice development. It is worth noting that the LibreOffice developers with unknown affiliation, who contributed 23% of the changes, make up 82% of the developer base, so there would appear to be a substantial community of developers contributing from outside the above-listed companies. </p> + + <h4>Some conclusions</h4> + <p> Last October, some <a href="http://fakehost/Articles/637742/">concerns</a> were raised on the OpenOffice list about the health of that project's community. At the time, Rob Weir <a href="http://fakehost/Articles/637743/">shrugged them off</a> as the result of a marketing effort by the LibreOffice crowd. There can be no doubt that the war of words between these two projects has gotten tiresome at times, but, looking at the above numbers, it is hard not to conclude that there is an issue that goes beyond marketing hype here. </p> + <p> In the 4½ years since its founding, the LibreOffice project has put together a community with over 250 active developers. There is support from multiple companies and an impressive rate of patches going into the project's repository. The project's ability to sustain nearly monthly releases on two branches is a direct result of that community's work. Swearing at LibreOffice is one of your editor's favorite pastimes, but it seems clear that the project is on a solid footing with a healthy community. </p> + <p> OpenOffice, instead, is driven by four developers from a single company — a company that appears to have been deemphasizing OpenOffice work for some time. As a result, the project's commit rate is a fraction of what LibreOffice is able to sustain and releases are relatively rare. As of this writing, the <a href="https://blogs.apache.org/OOo/">OpenOffice blog</a> shows no posts in 2015. In the October discussion, Rob <a href="http://fakehost/Articles/637750/">said</a> that "<span>the dogs may bark but the caravan moves on.</span>" That may be true, but, in this case, the caravan does not appear to be moving with any great speed. </p> - <p> Anything can happen in the free-software development world; it is entirely possible that a reinvigorated OpenOffice.org may yet give LibreOffice a run for its money. But something will clearly have to change to bring that future around. As things stand now, it is hard not to conclude that LibreOffice has won the battle for developer participation. </p> - <p><a href="http://fakehost/Articles/637735/#Comments">Comments (74 posted)</a> </p> - <p> <b>Page editor</b>: Jonathan Corbet - <br/> </p> - <h2>Inside this week's LWN.net Weekly Edition</h2> - <ul> - <li> <a href="http://fakehost/Articles/637395/">Security</a>: Toward secure package downloads; New vulnerabilities in drupal, mozilla, openssl, python-django ... </li> - <li> <a href="http://fakehost/Articles/637396/">Kernel</a>: LSFMM coverage: NFS, defragmentation, epoll(), copy offload, and more. </li> - <li> <a href="http://fakehost/Articles/637397/">Distributions</a>: A look at Debian's 2015 DPL candidates; Debian, Fedora, ... </li> - <li> <a href="http://fakehost/Articles/637398/">Development</a>: A look at GlusterFS; LibreOffice Online; Open sourcing existing code; Secure Boot in Windows 10; ... </li> - <li> <a href="http://fakehost/Articles/637399/">Announcements</a>: A Turing award for Michael Stonebraker, Sébastien Jodogne, ReGlue are Free Software Award winners, Kat Walsh joins FSF board of directors, Cyanogen, ... </li> - </ul><b>Next page</b> - <p style="display: inline;" class="readability-styled">: </p><a href="http://fakehost/Articles/637395/">Security>></a> - <br/> - </div> - </td> - <td class="RightColumn"> </td> - </div> -</div>
\ No newline at end of file + <p> Anything can happen in the free-software development world; it is entirely possible that a reinvigorated OpenOffice.org may yet give LibreOffice a run for its money. But something will clearly have to change to bring that future around. As things stand now, it is hard not to conclude that LibreOffice has won the battle for developer participation. </p> + <p><a href="http://fakehost/Articles/637735/#Comments">Comments (74 posted)</a> </p> + + <p> <b>Page editor</b>: Jonathan Corbet + <br></br></p> + <h2>Inside this week's LWN.net Weekly Edition</h2> + <ul><li> <a href="http://fakehost/Articles/637395/">Security</a>: Toward secure package downloads; New vulnerabilities in drupal, mozilla, openssl, python-django ... </li> + <li> <a href="http://fakehost/Articles/637396/">Kernel</a>: LSFMM coverage: NFS, defragmentation, epoll(), copy offload, and more. </li> + <li> <a href="http://fakehost/Articles/637397/">Distributions</a>: A look at Debian's 2015 DPL candidates; Debian, Fedora, ... </li> + <li> <a href="http://fakehost/Articles/637398/">Development</a>: A look at GlusterFS; LibreOffice Online; Open sourcing existing code; Secure Boot in Windows 10; ... </li> + <li> <a href="http://fakehost/Articles/637399/">Announcements</a>: A Turing award for Michael Stonebraker, Sébastien Jodogne, ReGlue are Free Software Award winners, Kat Walsh joins FSF board of directors, Cyanogen, ... </li> + </ul><b>Next page</b><p>: </p><a href="http://fakehost/Articles/637395/">Security>></a> + <br></br></div> + + </td> + + <td class="RightColumn"> + + </td> + </div>
\ No newline at end of file diff --git a/test/test-pages/remove-extra-brs/expected.html b/test/test-pages/remove-extra-brs/expected.html index 05afcfc..f8f8a6c 100644 --- a/test/test-pages/remove-extra-brs/expected.html +++ b/test/test-pages/remove-extra-brs/expected.html @@ -1,13 +1,16 @@ -<div id="readability-page-1" class="page"> - <div> - <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p> - <p> - <p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p> - </p> - <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> - </div> - <div> - <p>Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p> - <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> - </div> -</div>
\ No newline at end of file +<div> + <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua.</p> + <p><p>Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> + </p></div><div> + <p>Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat.</p> + <p>Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> + </div>
\ No newline at end of file diff --git a/test/test-pages/remove-extra-paragraphs/expected.html b/test/test-pages/remove-extra-paragraphs/expected.html index f731d75..a7c6318 100644 --- a/test/test-pages/remove-extra-paragraphs/expected.html +++ b/test/test-pages/remove-extra-paragraphs/expected.html @@ -1,11 +1,23 @@ -<div id="readability-page-1" class="page"> - <div> - <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p> - <p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p> - <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> - </div> - <div> - <p>Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p> - <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> - </div> -</div>
\ No newline at end of file +<div> + <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua.</p> + + <p>Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat.</p> + + + <p>Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> + + </div><div> + <p>Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat.</p> + + <p>Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> + + </div>
\ No newline at end of file diff --git a/test/test-pages/reordering-paragraphs/expected.html b/test/test-pages/reordering-paragraphs/expected.html index 7d15fcc..4a46dd5 100644 --- a/test/test-pages/reordering-paragraphs/expected.html +++ b/test/test-pages/reordering-paragraphs/expected.html @@ -1,5 +1,26 @@ -<div id="readability-page-1" class="page"> - <p id="first">Regarding item# 11111, under sufficiently extreme conditions, quarks may become deconfined and exist as free particles. In the course of asymptotic freedom, the strong interaction becomes weaker at higher temperatures. Eventually, color confinement would be lost and an extremely hot plasma of freely moving quarks and gluons would be formed. This theoretical phase of matter is called quark-gluon plasma.[81] The exact conditions needed to give rise to this state are unknown and have been the subject of a great deal of speculation and experimentation.</p> - <p id="second">Regarding item# 22222, under sufficiently extreme conditions, quarks may become deconfined and exist as free particles. In the course of asymptotic freedom, the strong interaction becomes weaker at higher temperatures. Eventually, color confinement would be lost and an extremely hot plasma of freely moving quarks and gluons would be formed. This theoretical phase of matter is called quark-gluon plasma.[81] The exact conditions needed to give rise to this state are unknown and have been the subject of a great deal of speculation and experimentation.</p> - <p id="third">Regarding item# 33333, under sufficiently extreme conditions, quarks may become deconfined and exist as free particles. In the course of asymptotic freedom, the strong interaction becomes weaker at higher temperatures. Eventually, color confinement would be lost and an extremely hot plasma of freely moving quarks and gluons would be formed. This theoretical phase of matter is called quark-gluon plasma.[81] The exact conditions needed to give rise to this state are unknown and have been the subject of a great deal of speculation and experimentation.</p> - <br id="br2"/> </div>
\ No newline at end of file +<div> + <p id="first">Regarding item# 11111, under sufficiently extreme conditions, quarks may + become deconfined and exist as free particles. In the course of asymptotic + freedom, the strong interaction becomes weaker at higher temperatures. + Eventually, color confinement would be lost and an extremely hot plasma + of freely moving quarks and gluons would be formed. This theoretical phase + of matter is called quark-gluon plasma.[81] The exact conditions needed + to give rise to this state are unknown and have been the subject of a great + deal of speculation and experimentation.</p> + <p id="second">Regarding item# 22222, under sufficiently extreme conditions, quarks may + become deconfined and exist as free particles. In the course of asymptotic + freedom, the strong interaction becomes weaker at higher temperatures. + Eventually, color confinement would be lost and an extremely hot plasma + of freely moving quarks and gluons would be formed. This theoretical phase + of matter is called quark-gluon plasma.[81] The exact conditions needed + to give rise to this state are unknown and have been the subject of a great + deal of speculation and experimentation.</p> + <p id="third">Regarding item# 33333, under sufficiently extreme conditions, quarks may + become deconfined and exist as free particles. In the course of asymptotic + freedom, the strong interaction becomes weaker at higher temperatures. + Eventually, color confinement would be lost and an extremely hot plasma + of freely moving quarks and gluons would be formed. This theoretical phase + of matter is called quark-gluon plasma.[81] The exact conditions needed + to give rise to this state are unknown and have been the subject of a great + deal of speculation and experimentation.</p> + <br id="br2"></br></div>
\ No newline at end of file diff --git a/test/test-pages/replace-brs/expected.html b/test/test-pages/replace-brs/expected.html index 89bdf3f..ba2d4fd 100644 --- a/test/test-pages/replace-brs/expected.html +++ b/test/test-pages/replace-brs/expected.html @@ -1,11 +1,14 @@ -<div id="readability-page-1" class="page"> - <div> - <p style="display: inline;" class="readability-styled"> Lorem ipsum</p> - <p style="display: inline;" class="readability-styled">dolor sit</p> - <p> amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p> - </div> - <div> - <p style="display: inline;" class="readability-styled"> Tempor</p> - <p>incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p> - </div> -</div>
\ No newline at end of file +<div><p> + Lorem ipsum</p><p>dolor sit</p><p>amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + </p></div><div><p> + Tempor</p><p>incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + </p></div>
\ No newline at end of file |