Merge tag 'sisu-markup-samples_7.1.2' into debian/sid

SiSU markup samples 7.1.2

9 files changed, 51 insertions, 20 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c820b7c..f23c7e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,30 @@ Source: <http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary>
 
 Reverse Chronological:
 
+* sisu-markup-samples_7.1.2.orig.tar.xz (2015-09-30:39/3) [sisu at 7.1.5]
+  http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=log;h=refs/tags/sisu-markup-samples_7.1.5
+
+  * book index markup related touches
+    Democratizing Innovation; Free Culture; Two Bits; Viral Spiral
+
+  * bibliography related, minor
+    Free For All; Two Bits
+
+  * update a few urls
+    Democratizing Innovation; Two Bits
+
+  * make a blurb non-substantive, no ocn
+    Wealth of Networks
+
+  * typo...
+    Two Bits
+
+  * minimal markup samples, header, identify structure (heading match regex)
+    Don Quixote; War and Peace
+
+  * header cleaning
+    War and Peace
+
 * sisu-markup-samples_7.1.1.orig.tar.xz (2015-05-21:20/4) [version follows sisu]
   http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=log;h=refs/tags/sisu-markup-samples_7.1.1
 
diff --git a/data/samples/current/en/democratizing_innovation.eric_von_hippel.sst b/data/samples/current/en/democratizing_innovation.eric_von_hippel.sst
index 83cb392..724eecc 100644
--- a/data/samples/current/en/democratizing_innovation.eric_von_hippel.sst
+++ b/data/samples/current/en/democratizing_innovation.eric_von_hippel.sst
@@ -30,7 +30,7 @@
 
 @links:
  { Democratizing Innovation }http://web.mit.edu/evhippel/www/democ1.htm
- { Eric von Hippel }http://web.mit.edu/evhippel/www/
+ { Eric von Hippel }http://evhippel.mit.edu/
  { @ Wikipedia }http://en.wikipedia.org/wiki/Democratizing_Innovation
  { Democratizing Innovation @ Amazon.com }http://www.amazon.com/Democratizing-Innovation-Eric-Von-Hippel/dp/0262720477
  { Democratizing Innovation @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=9780262720472
@@ -38,8 +38,8 @@
 @make:
  :breaks: new=:B,C; break=1
  :texpdf_font: Liberation Sans
- :home_button_image: {di_evh.png }http://web.mit.edu/evhippel/www/
- :footer: {Eric von Hippel}http://web.mit.edu/evhippel/www/
+ :home_button_image: {di_evh.png }http://evhippel.mit.edu/
+ :footer: {Eric von Hippel}http://evhippel.mit.edu/
 
 :A~ @title @author
 
@@ -111,7 +111,8 @@ Then I remembered the "Chip," a small experimental board we had built with foots
 
 The whole sport of high-performance windsurfing really started from that. As soon as I did it, there were about ten of us who sailed all the time together and within one or two days there were various boards out there that had footstraps of various kinds on them, and we were all going fast and jumping waves and stuff. It just kind of snowballed from there. (Shah 2000)
 ={ Shah, S. ;
-   windsurfing +1 }
+   windsurfing +1
+}
 
 By 1998, more than a million people were engaged in windsurfing, and a large fraction of the boards sold incorporated the user-developed innovations for the high-performance sport.
 
@@ -2043,7 +2044,8 @@ By freely revealing information about an innovative product or process, a user m
 
 A variation of this argument applies to the free revealing among competing manufacturers documented by Henkel (2003). Competing developers of embedded Linux systems were creating software that was specifically designed to run the hardware products of their specific clients. Each manufacturer could freely reveal this equipment-specific code without fear of direct competitive repercussions: it was applicable mainly to specific products made by a manufacturer's client, and it was less valuable to others. At the same time, all would jointly benefit from free revealing of improvements to the underlying embedded Linux code base, upon which they all build their proprietary products. After all, the competitive advantages of all their products depended on this code base's being equal to or better than the proprietary software code used by other manufacturers of similar products. Additionally, Linux software was a complement to hardware that many of the manufacturers in Henkel's sample also sold. Improved Linux software would likely increase sales of their complementary hardware products. (Complement suppliers' incentives to innovate have been modeled by Harhoff (1996).)
 ={ Linux ;
-   Henkel, J. }
+   Henkel, J.
+}
 
 !_ Free Revealing and Reuse
 ={ Free revealing of innovation information +2 }
@@ -2697,7 +2699,7 @@ Interesting examples also exist regarding on the impact a commons can have on th
    Linux ;
    Weber, S. ;
    Intellectual property rights :
-     licensing of +1 ;
+     licensing of +1
 }
 
 Similar actions can keep conditions for free access to materials held within a commons from degrading and being lost over time. Chris Hanson, a Principal Research Scientist at MIT, illustrates this with an anecdote regarding an open source software component called ipfilter. The author of ipfilter attempted to "lock" the program by changing licensing terms of his program to disallow the distribution of modified versions. His reasoning was that Ipfilter, a network-security filter, must be as bug-free as possible, and that this could best be ensured by his controlling access. His actions ignited a flame war in which the author was generally argued to be selfish and overreaching. His program, then an essential piece of BSD operating systems, was replaced by newly written code in some systems within the year. The author, Hanson notes, has since changed his licensing terms back to a standard BSD-style (unrestricted) license.
diff --git a/data/samples/current/en/free_culture.lawrence_lessig.sst b/data/samples/current/en/free_culture.lawrence_lessig.sst
index e720f9d..588da66 100644
--- a/data/samples/current/en/free_culture.lawrence_lessig.sst
+++ b/data/samples/current/en/free_culture.lawrence_lessig.sst
@@ -487,7 +487,8 @@ We live in a world that celebrates "property." I am one of those celebrants. I b
 But it takes just a second's reflection to realize that there is plenty of value out there that "property" doesn't capture. I don't mean "money can't buy you love," but rather, value that is plainly part of a process of production, including commercial as well as noncommercial production. If Disney animators had stolen a set of pencils to draw Steamboat Willie, we'd have no hesitation in condemning that taking as wrong - even though trivial, even if unnoticed. Yet there was nothing wrong, at least under the law of the day, with Disney's taking from Buster Keaton or from the Brothers Grimm. There was nothing wrong with the taking from Keaton because Disney's use would have been considered "fair." There was nothing wrong with the taking from the Grimms because the Grimms' work was in the public domain.
 ={ Disney, Walt +5 ;
    Grimm fairy tales +1 ;
-   Keaton, Buster }
+   Keaton, Buster
+}
 
 Thus, even though the things that Disney took - or more generally, the things taken by anyone exercising Walt Disney creativity - are valuable, our tradition does not treat those takings as wrong. Some things remain free for the taking within a free culture, and that freedom is good.
 ={ free culture :
@@ -3029,7 +3030,8 @@ Concentration in size alone is one thing. The more invidious change is in the na
 ={ Fallows, James +1 ;
    radio :
      ownership concentration in +2 ;
-   Murdoch, Rupert +1 }
+   Murdoch, Rupert +1
+}
 
 ``` quote
 Murdoch's companies now constitute a production system unmatched in its integration. They supply content - Fox movies ... Fox TV shows ... Fox-controlled sports broadcasts, plus newspapers and books. They sell the content to the public and to advertisers - in newspapers, on the broadcast network, on the cable channels. And they operate the physical distribution system through which the content reaches the customers. Murdoch's satellite systems now distribute News Corp. content in Europe and Asia; if Murdoch becomes DirecTV's largest single owner, that system will serve the same function in the United States."~{ James Fallows, "The Age of Murdoch," /{Atlantic Monthly}/ (September 2003): 89. }~
diff --git a/data/samples/current/en/free_for_all.peter_wayner.sst b/data/samples/current/en/free_for_all.peter_wayner.sst
index d105996..eae2188 100644
--- a/data/samples/current/en/free_for_all.peter_wayner.sst
+++ b/data/samples/current/en/free_for_all.peter_wayner.sst
@@ -3086,7 +3086,8 @@ url: http://www.nytimes.com/library/1999/01/biztech/articles/15soft.html
 au: Bronson, Po
 ti: Manager's Journal Silicon Valley Searches for an Image
 src: Wall Street Journal
-yr: June 8, 1998
+yr: 1998-06-08
+% yr: June 8, 1998
 
 au: Bronson, Po
 ti: Nudist on the Late Shift: And Other True Tales of Silicon Valley
@@ -3161,7 +3162,7 @@ yr: 1981
 au: Gleick, James
 ti: Control Freaks
 src: New York Times
-yr: July 19, 1998-07-19
+yr: 1998-07-19
 
 au: Gleick, James
 ti: Broken Windows Theory
@@ -3171,6 +3172,7 @@ yr: 1999-03-21
 au: FatBrain.com
 ti: Interview with Linus Torvalds
 src: FatBrain.com, May 1999
+yr: 1999
 url: http://www.kt.opensrc.org/interviews/ti19990528_fb.html
 
 au: Jelinek, Jakub
diff --git a/data/samples/current/en/the_wealth_of_networks.yochai_benkler.sst b/data/samples/current/en/the_wealth_of_networks.yochai_benkler.sst
index 828dbdd..bf7935b 100644
--- a/data/samples/current/en/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/samples/current/en/the_wealth_of_networks.yochai_benkler.sst
@@ -5786,6 +5786,8 @@ We are in the midst of a quite basic transformation in how we perceive the world
 
 We have an opportunity to change the way we create and exchange information, knowledge, and culture. By doing so, we can make the twentyfirst century one that offers individuals greater autonomy, political communities greater democracy, and societies greater opportunities for cultural self-reflection and human connection. We can remove some of the transactional barriers to material opportunity, and improve the state of human development everywhere. Perhaps these changes will be the foundation of a true transformation toward more liberal and egalitarian societies. Perhaps they will merely improve, in well-defined but smaller ways, human life along each of these dimensions. That alone is more than enough to justify an embrace of the networked information economy by anyone who values human welfare, development, and freedom.
 
+--~#
+
 1~blurb Blurb
 
 _1 "In this book, Benkler establishes himself as the leading intellectual of the information age. Profoundly rich in its insight and truth, this work will be the central text for understanding how networks have changed how we understand the world. No work to date has more carefully or convincingly made the case for a fundamental change in how we understand the economy of society." Lawrence Lessig, professor of law, Stanford Law School
@@ -5804,6 +5806,8 @@ The author's website is: http://www.benkler.org/
 
 The books may be purchased at bookshops, including { Amazon.com }http://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0300110561/ or at { Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0300110561
 
+--+#
+
 % Not final copy: markup not final, output numbering is therefore subject to change
 
 % italics need checking
diff --git a/data/samples/current/en/two_bits.christopher_kelty.sst b/data/samples/current/en/two_bits.christopher_kelty.sst
index 57c6249..07234bf 100644
--- a/data/samples/current/en/two_bits.christopher_kelty.sst
+++ b/data/samples/current/en/two_bits.christopher_kelty.sst
@@ -26,6 +26,7 @@
  { Christopher M. Kelty }http://kelty.org/
  { Two Bits @ Amazon.com }http://www.amazon.com/Two-Bits-Cultural-Significance-Software/dp/0822342642
  { Two Bits @ Barnes & Noble }http://search.barnesandnoble.com/Two-Bits/Christopher-M-Kelty/e/9780822342649
+ { Discussion @ Lambda the Ultimate }http://lambda-the-ultimate.org/node/3696
 
 @make:
  :breaks: new=:C; break=1
@@ -894,7 +895,7 @@ The attitudes that geeks take in responding to these questions fall along a spec
 
 2~ Protestant Reformation
 
-Geeks love allegories about the Protestant Reformation; they relish stories of Luther and Calvin, of popery and iconoclasm, of reformation ,{[pg 67]}, over revolution. Allegories of Protestant revolt allow geeks to make sense of the relationship between the state (the monarchy), large corporations (the Catholic Church), the small start-ups, individual programmers, and adepts among whom they spend most of their time (Protestant reformers), and the laity (known as "lusers" and "sheeple"). It gives them a way to assert that they prefer reformation (to save capitalism from the capitalists) over revolution. Obviously, not all geeks tell stories of "religious wars" and the Protestant Reformation, but these images reappear often enough in conversations that most geeks will more or less instantly recognize them as a way of making sense of modern corporate, state, and political power in the arena of information technology: the figures of Pope, the Catholic Church, the Vatican, the monarchs of various nations, the laity, the rebel adepts like Luther and Calvin, as well as models of sectarianism, iconoclasm ("In the beginning was the Command Line"), politicoreligious power, and arcane theological argumentation.~{ Stephenson, In the Beginning Was the Command Line. }~ The allegories that unfold provide geeks a way to make sense of a similarly complex modern situation in which it is not the Church and the State that struggle, but the Corporation and the State; and what geeks struggle over are not matters of church doctrine and organization, but matters of information technology and its organization as intellectual property and economic motor. I stress here that this is not an analogy that I myself am making (though I happily make use of it), but is one that is in wide circulation among the geeks I study. To the historian or religious critic, it may seem incomplete, or absurd, or bizarre, but it still serves a specific function, and this is why I highlight it as one component of the practical and technical ideas of order that geeks share.
+Geeks love allegories about the Protestant Reformation; they relish stories of Luther and Calvin, of property and iconoclasm, of reformation ,{[pg 67]}, over revolution. Allegories of Protestant revolt allow geeks to make sense of the relationship between the state (the monarchy), large corporations (the Catholic Church), the small start-ups, individual programmers, and adepts among whom they spend most of their time (Protestant reformers), and the laity (known as "lusers" and "sheeple"). It gives them a way to assert that they prefer reformation (to save capitalism from the capitalists) over revolution. Obviously, not all geeks tell stories of "religious wars" and the Protestant Reformation, but these images reappear often enough in conversations that most geeks will more or less instantly recognize them as a way of making sense of modern corporate, state, and political power in the arena of information technology: the figures of Pope, the Catholic Church, the Vatican, the monarchs of various nations, the laity, the rebel adepts like Luther and Calvin, as well as models of sectarianism, iconoclasm ("In the beginning was the Command Line"), politicoreligious power, and arcane theological argumentation.~{ Stephenson, In the Beginning Was the Command Line. }~ The allegories that unfold provide geeks a way to make sense of a similarly complex modern situation in which it is not the Church and the State that struggle, but the Corporation and the State; and what geeks struggle over are not matters of church doctrine and organization, but matters of information technology and its organization as intellectual property and economic motor. I stress here that this is not an analogy that I myself am making (though I happily make use of it), but is one that is in wide circulation among the geeks I study. To the historian or religious critic, it may seem incomplete, or absurd, or bizarre, but it still serves a specific function, and this is why I highlight it as one component of the practical and technical ideas of order that geeks share.
 ={ Intellectual property ;
    Luther, Martin +15 ;
    reformation vs. revolution ;
@@ -1564,7 +1565,8 @@ The movement, as a practice of discussion and argument, is made up of stories. I
 Stories of the movement are also stories of a recursive public. The fact that movement isn’t quite the right word is evidence of a kind of grasping, a figuring out of why these practices make sense to all these geeks, in this place and time; it is a practice that is not so different from my own ethnographic engagement with it. Note that both Free Software and Open Source tell stories of movement(s): they are not divided by a commercial-noncommercial line, even if they are divided by ill-defined and hazy notions of their ultimate goals. The problem of a recursive public (or, in an alternate language, a recursive market) as a social imaginary of moral and technical order is common to both of them as part of their practices. Thus, stories about "the movement" are detailed stories about the technical and moral order that geeks inhabit, and they are bound up with the functions and fates of the Internet. Often these stories are themselves practices of inclusion and exclusion (e.g., "this license is not a Free Software license" or "that software is not an open system"); sometimes the stories are normative definitions about how Free Software should look. But they are, always, stories that reveal the shared moral and technical imaginations that make up Free Software as a recursive public.
 ={ moral and technical order ;
    recursive public ;
-   social imaginary }
+   social imaginary
+}
 
 2~ Conclusion
 
@@ -1938,7 +1940,7 @@ Openness is an unruly concept. While free tends toward ambiguity (free as in spe
 In this chapter I tell the story of the contest over the meaning of "open systems" from 1980 to 1993, a contest to create a simultaneously moral and technical infrastructure within the computer ,{[pg 144]}, industry.~{ Moral in this usage signals the "moral and social order" I explored through the concept of social imaginaries in chapter 1. Or, in the Scottish Enlightenment sense of Adam Smith, it points to the right organization and relations of exchange among humans. }~ The infrastructure in question includes technical components—the UNIX operating system and the TCP/IP protocols of the Internet as open systems—but it also includes "moral" components, including the demand for structures of fair and open competition, antimonopoly and open markets, and open-standards processes for high-tech networked computers and software in the 1980s.~{ There is, of course, a relatively robust discourse of open systems in biology, sociology, systems theory, and cybernetics; however, that meaning of open systems is more or less completely distinct from what openness and open systems came to mean in the computer industry in the period book-ended by the arrivals of the personal computer and the explosion of the Internet (ca. 1980-93). One relevant overlap between these two meanings can be found in the work of Carl Hewitt at the MIT Media Lab and in the interest in "agorics" taken by K. Eric Drexler, Bernardo Huberman, and Mark S. Miller. See Huberman, The Ecology of Computation. }~ By moral, I mean imaginations of the proper order of collective political and commercial action; referring to much more than simply how individuals should act, moral signifies a vision of how economy and society should be ordered collectively.
 ={ infrastructure ;
    moral and technical order +3 ;
-   monopoly +1 ;
+   monopoly +1
 }
 
 The open-systems story is also a story of the blind spot of open systems—in that blind spot is intellectual property. The story reveals a tension between incompatible moral-technical orders: on the one hand, the promise of multiple manufacturers and corporations creating interoperable components and selling them in an open, heterogeneous market; on the other, an intellectual-property system that encouraged jealous guarding and secrecy, and granted monopoly status to source code, designs, and ideas in order to differentiate products and promote competition. The tension proved irresolvable: without shared source code, for instance, interoperable operating systems are impossible. Without interoperable operating systems, internetworking and portable applications are impossible. Without portable applications that can run on any system, open markets are impossible. Without open markets, monopoly power reigns.
@@ -4440,8 +4442,6 @@ The open-access movement, and examples like Connexions, are attempts at maintain
 
 Understanding how Free Software works and how it has developed along with the Internet and certain practices of legal and cultural critique may be essential to understanding the reliable foundation of knowledge production and circulation on which we still seek to ground legitimate forms of governance. Without Free Software, the only response to the continuing forms of excess we associate with illegitimate, unaccountable, unjust forms of governance might just be mute cynicism. With it, we are in possession of a range of practical tools, structured responses and clever ways of working through our complexity toward the promises of a shared imagination of legitimate and just governance. There is no doubt room for critique—and many scholars will demand it—but scholarly critique will have to learn how to sit, easily or uneasily, with Free Software as critique. Free Software can also exclude, just as any public or public sphere can, but this is not, I think, cause for resistance, but cause for joining. The alternative would be to create no new rules, no new practices, no new procedures—that is, to have what we already have. Free Software does not belong to geeks, and it is not the only form of becoming public, but it is one that will have a profound structuring effect on any forms that follow.
 
-:B~ Bibliography
-
 1~!bibliography Bibliography
 
 % ,{[pg 349]},
diff --git a/data/samples/current/en/viral_spiral.david_bollier.sst b/data/samples/current/en/viral_spiral.david_bollier.sst
index e82418e..dee9463 100644
--- a/data/samples/current/en/viral_spiral.david_bollier.sst
+++ b/data/samples/current/en/viral_spiral.david_bollier.sst
@@ -3084,7 +3084,6 @@ By getting the CC licenses integrated into so many types of software and Web ser
      copyright law, and ;
    Internet :
      communication system, as +1 ;
-    ;
    Creative Commons (CC) :
      growth of +2
 }
diff --git a/data/samples/minimal/don_quixote.miguel_de_cervantes.sst b/data/samples/minimal/don_quixote.miguel_de_cervantes.sst
index a41039f..e68d8b4 100644
--- a/data/samples/minimal/don_quixote.miguel_de_cervantes.sst
+++ b/data/samples/minimal/don_quixote.miguel_de_cervantes.sst
@@ -30,7 +30,7 @@
  { Syntax }http://www.jus.uio.no/sisu/sample/syntax/don_quixote.miguel_de_cervantes.sst.html
 
 @make:
- :headings: none; PART; VOLUME; Chapter;
+ :headings: PART; VOLUME; none; Chapter;
  :breaks: new=:C; break=1
 
 % SiSU: http://www.jus.uio.no/sisu
diff --git a/data/samples/minimal/war_and_peace.leo_tolstoy.sst b/data/samples/minimal/war_and_peace.leo_tolstoy.sst
index a305ce0..12e0538 100644
--- a/data/samples/minimal/war_and_peace.leo_tolstoy.sst
+++ b/data/samples/minimal/war_and_peace.leo_tolstoy.sst
@@ -7,9 +7,7 @@
  :translator: Maude, Aylmer; Maude, Louise Shanks
 
 @classify:
- :type: Book
  :topic_register: SiSU:markup sample:book;book:novel:historical romance|war novel;Russian:original text;original text language:Russian
- :pg: 2600
 
 % @rights:
 
@@ -30,7 +28,7 @@
 @vocabulary: none
 
 @make:
- :headings: none; BOOK|FIRST|SECOND; none; CHAPTER;
+ :headings: BOOK|FIRST|SECOND; none; none; CHAPTER;
  :breaks: new=:C; break=1
 
 @links: { Wikipedia entry }http://en.wikipedia.org/wiki/War_and_peace