@@ -18,7 +18,7 @@
Photo
-

+

diff --git a/test/test-pages/nytimes-3/expected.html b/test/test-pages/nytimes-3/expected.html index a8a9bc3..cd0aa56 100644 --- a/test/test-pages/nytimes-3/expected.html +++ b/test/test-pages/nytimes-3/expected.html @@ -7,8 +7,8 @@ New York’s aging below-street infrastructure is tough to maintain, and the corrosive rock salt and “freeze-thaw” cycles of winter make it even worse.

-
-

Image +

+

Image

A Con Edison worker repairing underground cables this month in Flushing, Queens. The likely source of the problem was water and rock salt that had seeped underground.CreditCreditChang W. Lee/The New York Times @@ -34,10 +34,10 @@

- [What you need to know to start the day: Get New York Today in your inbox.] + [What you need to know to start the day: Get New York Today in your inbox.]

- A series of recent manhole fires in the heart of Manhattan forced the evacuation of several theaters and was a stark reminder that the subway is not the only creaky infrastructure beneath the streets of New York City. + A series of recent manhole fires in the heart of Manhattan forced the evacuation of several theaters and was a stark reminder that the subway is not the only creaky infrastructure beneath the streets of New York City.

Underground lies a chaotic assemblage of utilities that, much like the subway, are lifelines for the city: a sprawling tangle of water mains, power cables, gas and steam lines, telecom wires and sewers. @@ -58,8 +58,8 @@

-
-

Image +

+

Image

In the late 1800s, overhead utilities were buried to lessen the exposure to winter weather.CreditKirsten Luce for The New York Times @@ -92,7 +92,7 @@
-
+

Image

@@ -112,7 +112,7 @@
-
+

Image

@@ -157,7 +157,7 @@
-
+

Image

@@ -189,7 +189,7 @@
-
+

Image

@@ -212,7 +212,7 @@
@@ -222,7 +222,7 @@
-
+

Image

diff --git a/test/test-pages/nytimes-4/expected.html b/test/test-pages/nytimes-4/expected.html index 855eb55..73ea987 100644 --- a/test/test-pages/nytimes-4/expected.html +++ b/test/test-pages/nytimes-4/expected.html @@ -7,8 +7,8 @@ Tax cuts, spending increases and higher interest rates could make it harder to respond to future recessions and deal with other needs.

-
-

Image +

+

Image

Interest payments on the federal debt could surpass the Defense Department budget in 2023.CreditCreditJeon Heon-Kyun/EPA, via Shutterstock @@ -37,7 +37,7 @@ “It’s very much something to worry about,” said C. Eugene Steuerle, a fellow at the Urban Institute and a co-founder of the Urban-Brookings Tax Policy Center in Washington. “Everything else is getting squeezed.”

- Gradually rising interest rates would have made borrowing more expensive even without additional debt. But the tax cuts passed late last year have created a deeper hole, with the deficit increasing faster than expected. A budget bill approved in February that raised spending by $300 billion over two years will add to the financial pressure. + Gradually rising interest rates would have made borrowing more expensive even without additional debt. But the tax cuts passed late last year have created a deeper hole, with the deficit increasing faster than expected. A budget bill approved in February that raised spending by $300 billion over two years will add to the financial pressure.

The deficit is expected to total nearly $1 trillion next year — the first time it has been that big since 2012, when the economy was still struggling to recover from the financial crisis and interest rates were near zero. @@ -130,7 +130,7 @@

The Star Wars Special Editions Caused Controversy

In 2015, Attack of the Clones and Revenge of the Sith received limited 3D showings at Celebration Anaheim. Other than that, it seems as though Disney has decided to refocus Lucasfilm’s efforts to new films. Of course, that’s why the saga has produced new content beginning with The Force Awakens. However, it looks like Lucasfilm isn’t likely to generate 3D versions of the original trilogy anytime soon.

Why the Original Film Cuts Matter

- +

Admittedly, the differences between the original trilogy’s unaltered cuts and the Special Editions appeal to more hardcore fans. Casual fans are less likely to care about whether Greedo or Han Solo shot first. Still, given Star Wars’ indelible impact on pop culture, there’s certainly a market for the original trilogy’s unaltered cuts. They might not be for every Star Wars fan, but many of us care about them.

ILM supervisor John Knoll, who first pitched the story idea for Rogue One, said last year that ILM finished a brand new 4K restoration print of A New Hope. For that reason, it seems likely that Lucasfilm will finally give diehard fans the original film cuts that they’ve clamored for. There’s no word yet whether the unaltered cuts will be released in theaters or on home media. At the very least, however, fans will likely get them after all this time. After all, the Special Editions marked the saga’s 20th anniversary. Star Wars turns 40 years old this year, so there’s no telling what’s in store.

diff --git a/test/test-pages/wikipedia-2/expected.html b/test/test-pages/wikipedia-2/expected.html index 4fed8d1..3ba16b8 100644 --- a/test/test-pages/wikipedia-2/expected.html +++ b/test/test-pages/wikipedia-2/expected.html @@ -1,4 +1,4 @@ -
+
@@ -609,7 +609,7 @@

Countries -  New Zealand +  New Zealand   @@ -618,10 +618,10 @@

  -  Cook Islands +  Cook Islands -  Niue +  Niue @@ -648,7 +648,7 @@

Ross Dependency -  Tokelau +  Tokelau 15 islands @@ -747,13 +747,13 @@

  • -

    +

  • -

    +

    • @@ -3096,7 +3096,7 @@

    Key Development Forecasts for New Zealand from International Futures
  • - Wikimedia Atlas of New Zealand + Wikimedia Atlas of New Zealand
    • diff --git a/test/test-pages/wikipedia-3/expected.html b/test/test-pages/wikipedia-3/expected.html index ff7c62c..89c59fb 100644 --- a/test/test-pages/wikipedia-3/expected.html +++ b/test/test-pages/wikipedia-3/expected.html @@ -1,4 +1,4 @@ -
    +

    diff --git a/test/test-pages/wikipedia/expected.html b/test/test-pages/wikipedia/expected.html index 0764fb8..7720e8a 100644 --- a/test/test-pages/wikipedia/expected.html +++ b/test/test-pages/wikipedia/expected.html @@ -2,6 +2,7 @@ + +
    Mozilla
    Mozilla dinosaur head logo.png @@ -39,6 +40,7 @@ Website mozilla.org/,%20https://www.mozilla.org/tr/

    Mozilla is a free-software community, created in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions.[1] The community is supported institutionally by the Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.[2]

    Mozilla produces many products such as the Firefox web browser, Thunderbird e-mail client, Firefox Mobile web browser, Firefox OS mobile operating system, Bugzilla bug tracking system and other projects.

    @@ -79,7 +81,7 @@

    Pledge[Software[edit]

    -

    +

    Firefox[edit]

    @@ -107,7 +109,7 @@

    SeaMonkey[

    +

    SeaMonkey (formerly the Mozilla Application Suite) is a free and open source cross platform suite of Internet software components including a web browser component, a client for sending and receiving email and USENET newsgroup messages, an HTML editor (Mozilla Composer) and the ChatZilla IRC client.

    On March 10, 2005, the Mozilla Foundation announced that it would not release any official versions of Mozilla Application Suite beyond 1.7.x, since it had now focused on the standalone applications Firefox and Thunderbird.[57] SeaMonkey is now maintained by the SeaMonkey Council, which has trademarked the SeaMonkey name with help from the Mozilla Foundation.[58] The Mozilla Foundation provides project hosting for the SeaMonkey developers.

    @@ -116,7 +118,7 @@

    Bugzilla[

    +

    Bugzilla is a web-based general-purpose bug tracking system, which was released as open source software by Netscape Communications in 1998 along with the rest of the Mozilla codebase, and is currently stewarded by Mozilla. It has been adopted by a variety of organizations for use as a bug tracking system for both free and open source software and proprietary projects and products, including the Mozilla Foundation, the Linux kernel, GNOME, KDE, Red Hat, Novell, Eclipse and LibreOffice.[59]

    Components[edit] @@ -183,13 +185,13 @@

    [Local communities[edit]

    -

    +

    There are a number of sub-communities that exist based on their geographical locations, where contributors near each other work together on particular activities, such as localization, marketing, PR and user support.

    Mozilla Reps[edit]

    -

    +

    The Mozilla Reps program aims to empower and support volunteer Mozillians who want to become official representatives of Mozilla in their region/locale.

    The program provides a simple framework and a specific set of tools to help Mozillians to organize and/or attend events, recruit and mentor new contributors, document and share activities, and support their local communities better.

    @@ -207,7 +209,7 @@

    Conferences and events[

    Mozilla Festival[edit]

    -

    +

    Speakers from the Knight Foundation discuss the future of news at the 2011 Mozilla Festival in London.

    @@ -449,12 +451,14 @@

    References[External links[edit]

    + +
    - + Wikimedia Commons has media related to Mozilla.
    • Official website, including the Mozilla Manifesto
      • diff --git a/test/test-pages/wordpress/expected.html b/test/test-pages/wordpress/expected.html index 344eb7d..f7c8c73 100644 --- a/test/test-pages/wordpress/expected.html +++ b/test/test-pages/wordpress/expected.html @@ -9,7 +9,7 @@ -
      +
      @@ -17,15 +17,15 @@

      - +

      Stack Overflow published its analysis of 2017 hiring trends based on the targeting options employers selected when posting to Stack Overflow Jobs. The report, which compares data from 200 companies since 2015, ranks ReactJS, Docker, and Ansible at the top of the fastest growing skills in demand. When comparing the percentage change from 2015 to 2016, technologies like AJAX, Backbone.js, jQuery, and WordPress are less in demand.

      - +

      Stack Overflow also measured the demand relative to the available developers in different tech skills. The demand for backend, mobile, and database engineers is higher than the number of qualified candidates available. WordPress is last among the oversaturated fields with a surplus of developers relative to available positions.

      - +

      In looking at these results, it’s important to consider the inherent biases within the Stack Overflow ecosystem. In 2016, the site surveyed more than 56,000 developers but noted that the survey was “biased against devs who don’t speak English.” The average age of respondents was 29.6 years old and 92.8% of them were male.

      For two years running, Stack Overflow survey respondents have ranked WordPress among the most dreaded technologies that they would prefer not to use. This may be one reason why employers wouldn’t be looking to advertise positions on the site’s job board, which is the primary source of the data for this report.

      diff --git a/test/test-pages/yahoo-3/expected.html b/test/test-pages/yahoo-3/expected.html index 21bb560..148fd93 100644 --- a/test/test-pages/yahoo-3/expected.html +++ b/test/test-pages/yahoo-3/expected.html @@ -8,7 +8,7 @@ - +

      A photographer and Navy veteran is fighting back after a photo she posted to Facebook started an online backlash.

      diff --git a/test/test-pages/youth/expected.html b/test/test-pages/youth/expected.html index dba688f..fca28db 100644 --- a/test/test-pages/youth/expected.html +++ b/test/test-pages/youth/expected.html @@ -9,7 +9,7 @@

      　　 无独有偶，英国剑桥大学的李博灏也有着类似的经历。他表示，在国内读本科时，虽然关注过两会，但并不像现在这样，将关注点放在国家社会经济迫切需要解决的难题与问题上。“出国前更关心与我们学生的实际问题以及切身利益相关的议题，比如奖学金、助学金的发放与申请；相关工作行业就业前景等。”

      　　 在英国求学6年后，李博灏希望能够学有所用，为国家发展过程中遇到的难题寻求解决办法。因此随着课题研究的深入，他更加关注国家和社会目前所面临的挑战，比如中等收入陷阱、供给侧改革、创意创新产业的发展等议题。

      　　 还有一些学子表示，出国前对两会不太了解，出国后反而对两会热点多了些思考。在澳大利亚墨尔本留学的马素湘说：“想不关注都难啊！刷微博看新闻到处都是两会的消息。而且我现在学的是新闻专业，对世界发生的大小事都会留意。随着年龄、阅历增长，家国情怀也渐长，会关心国家发展的各方面问题。”

      -

      +

      图为李博灏在瑞士日内日瓦联合国欧洲总部的近影。

      　　关注点多与所学专业相关

      　　法学专业热议法定婚龄 很多人关心供给侧改革

      @@ -17,7 +17,7 @@

      　　 对此提案，卢宇有着自己的看法，“百花齐放的局面固然可喜，但也不能一哄而上，国家应该提高行业准入门槛，完善新能源汽车准入管理规则，从源头上进行制度创新，将一些不具备新能源汽车生产资质的厂家淘汰出局，并高度关注电池系统安全问题，严格执行充电桩生产的国际标准。”

      　　 马素湘表示，“出国读研之前，我在国内学习法学，因此对相关的问题比较感兴趣。今年两会上人大代表黄细花提出把法定婚龄降低到18岁的提案；而在微博的热搜榜上，一本儿童性教育读物引起了极大的争议。我认为降低婚龄并不适合我国国情。因为性教育的缺乏导致我国大部分人在18岁之前没有接受过完整的性教育，思想行动上也不够成熟，如何能够对自己的人生和自己的另一半负责？所以我希望能有人大代表提议在国民儿童阶段完善我国的性教育，而不是为了鼓励生育将法定婚龄提前。”

      　　 李博灏是英国剑桥大学制造业研究所创新设计管理中心的一名博士。他格外关注的话题是供给侧结构性改革，知识产权保护，消费升级等议题。“我的博士研究课题是关于推动创新设计密集型产业的发展从而帮助中等收入国家克服中等收入陷阱的探索，因此一直十分关注国内关于供给侧改革的相关议题。通过本届两会对于该议题的进一步关注，我希望可以有效地帮助我了解供给侧改革与中等收入陷阱问题目前的发展状况以及解决情况；也希望可以与更多的机构取得联系，并帮助他们了解该议题最前沿的研究与解决方案。”

      -

      +

      图为卢宇与祖国五星红旗和联合国会旗的合影。

      　　 两会成为了解国情的窗口

      　　 盼准确把握国家发展需求 愿寻求机遇回国有所作为