acmsiggraph: complete revision of layout and template file

- also support in the lyx2lyx argument conversion routine the case that "}{" appears in 2 consecutive ERTs
- also fix in lyx2lyx_tools.py the output of ERTs (it is important that we write the same amount of lines as if the ERT would have been inserted via LyX 2.0 or lyX 2.1)

lib/layouts/acmsiggraph.layout

@@ -62,18 +62,18 @@ NoCounter			subparagraph
 NoStyle			Subparagraph*
 
 
-Style Teaser
+Style "TOG online ID"
 	Margin			Dynamic
 	LatexType		Command
-	LatexName		teaser
+	LatexName		TOGonlineid
 	Category		FrontMatter
-	InTitle			1
+	InPreamble		1
 	ParSkip			0.4
 	BottomSep		0.5
 	Align			Left
 	LabelSep		xx
 	LabelType		Static
-	LabelString		"Teaser image:"
+	LabelString		"Oneline ID:"
 	LabelFont
 	  Color			Green
 	  Series		Bold
@@ -81,29 +81,111 @@ Style Teaser
 End
 
 
+Style "TOG volume"
+	CopyStyle		"TOG online ID"
+	LatexName		TOGvolume
+	LabelString		"Volume number:"
+End
+
+
+Style "TOG number"
+	CopyStyle		"TOG online ID"
+	LatexName		TOGnumber
+	LabelString		"Article number:"
+End
+
+
+Style "TOG article DOI"
+	CopyStyle		"TOG online ID"
+	LatexName		TOGarticleDOI
+	LabelString		"Article DOI:"
+End
+
+
+Style "TOG project URL"
+	CopyStyle		"TOG online ID"
+	LatexName		TOGprojectURL
+	KeepEmpty		1
+	LabelString		"Project URL:"
+End
+
+
+Style "TOG video URL"
+	CopyStyle		"TOG project URL"
+	LatexName		TOGvideoURL
+	LabelString		"Video URL:"
+End
+
+
+Style "TOG data URL"
+	CopyStyle		"TOG project URL"
+	LatexName		TOGdataURL
+	LabelString		"Data URL:"
+End
+
+
+Style "TOG code URL"
+	CopyStyle		"TOG project URL"
+	LatexName		TOGcodeURL
+	LabelString		"Code URL:"
+End
+
+
 Input stdtitle.inc
 Input stdstruct.inc
+NoStyle			Date
 
 
-InsetLayout "Flex:CRcat"
+# modify the Title definition from stdtitle.inc
-	LyxType			custom
+Style Title
-	LatexType		command
+	InTitle			0
-	LatexName		CRcat
+	InPreamble		1
-	Decoration		classic
-	LabelString		"CR category"
 	Font
-	  Color			foreground
+	  Family		Sans
-	  Size			Small
-	  Family		Roman
-	  Shape			Up
-	  Series		Medium
-	  Misc			No_Emph
-	  Misc			No_Noun
-	  Misc			No_Bar
 	EndFont
+End
+
+
+# modify the Author definition from stdtitle.inc
+Style Author
+	InTitle			0
+	InPreamble		1
+End
+
+
+Style "PDF author"
+	CopyStyle		"TOG project URL"
+	LatexName		pdfauthor
+	LabelString		"PDF author:"
+End
+
+Style Keywords
+	CopyStyle		"TOG project URL"
+	LatexName		keywords
+	LabelType		Static
+	LabelString		"Keywords:"
 	LabelFont
-	  Color			green
+	  Series		Bold
-	  Size			Small
+	  Size			Normal
+	EndFont
+End
+
+
+Style Teaser
+	Margin			Dynamic
+	LatexType		Command
+	LatexName		teaser
+	Category		FrontMatter
+	ParSkip			0.4
+	BottomSep		0.5
+	Align			Left
+	LabelSep		xx
+	LabelType		Static
+	LabelString		"Teaser image:"
+	LabelFont
+	  Series		Bold
+	  Size			Normal
+	  Color			Green
 	EndFont
 End
 
@@ -139,10 +221,12 @@ End
 Style "CR categories"
 	CopyStyle		Abstract
 	LatexName		CRcatlist
-	Category		FrontMatter
+	Margin			Dynamic
-	LeftMargin		M
+	ParbreakIsNewline	1
-	LabelType		Top_Environment
+	LeftMargin		""
-	LabelString		"Computing Review Categories"
+	LabelSep		xx
+	LabelType		Static
+	LabelString		"CR Categories:"
 	LabelFont
 	  Series		Bold
 	  Size			Normal
@@ -150,6 +234,64 @@ Style "CR categories"
 End
 
 
+InsetLayout "Flex:CRcat"
+	LyxType			custom
+	LatexType		command
+	LatexName		CRcat
+	Decoration		classic
+	LabelString		"CR category"
+	Font
+	  Color			foreground
+	  Size			Small
+	  Family		Roman
+	  Shape			Up
+	  Series		Medium
+	  Misc			No_Emph
+	  Misc			No_Noun
+	  Misc			No_Bar
+	EndFont
+	LabelFont
+	  Color			green
+	  Size			Small
+	EndFont
+	Argument 1
+          Mandatory		1
+          LabelString		"CR-number"
+          Tooltip		"Number of the category"
+        EndArgument
+        Argument 2
+          Mandatory		1
+          LabelString		"Subcategory"
+          Tooltip		"Subcategory"
+        EndArgument
+        Argument 3
+          Mandatory		1
+          LabelString		"Third-level"
+          Tooltip		"Third-level of the category"
+        EndArgument
+End
+
+
+InsetLayout "Flex:ShortCite"
+	CopyStyle		"Flex:CRcat"
+	ResetArgs		1
+	LatexName		shortcite
+	Decoration		Conglomerate
+	LabelString		"Short cite"
+End
+
+
+InsetLayout "Flex:Thanks"
+	CopyStyle		"Flex:ShortCite"
+	LatexName		thanks
+	Decoration		Classic
+	LabelString		"E-mail"
+	LabelFont
+	  Color			blue
+	EndFont
+End
+
+
 Style Acknowledgments
 	CopyStyle		Abstract
 	LatexName		acks

lib/lyx2lyx/lyx2lyx_tools.py

@@ -117,7 +117,7 @@ def put_cmd_in_ert(arg):
     Returns a list of strings, with the lines so wrapped.
     '''
     
-    ret = ["\\begin_inset ERT", "status collapsed", "\\begin_layout Plain Layout", ""]
+    ret = ["\\begin_inset ERT", "status collapsed", "", "\\begin_layout Plain Layout", ""]
     # It will be faster for us to work with a single string internally. 
     # That way, we only go through the unicode_reps loop once.
     if type(arg) is list:
@@ -128,7 +128,7 @@ def put_cmd_in_ert(arg):
       s = s.replace(rep[1], rep[0].replace('\\\\', '\\'))
     s = s.replace('\\', "\\backslash\n")
     ret += s.splitlines()
-    ret += ["\\end_layout", "\\end_inset"]
+    ret += ["\\end_layout", "", "\\end_inset"]
     return ret
 
 

lib/lyx2lyx/lyx_2_1.py

@@ -1374,40 +1374,64 @@ def revert_IEEEtran(document):
         return
 
 
-def convert_Argument_to_TeX_brace(document, line, n, nmax, environment):
+def convert_TeX_brace_to_Argument(document, line, n, nmax, inset, environment):
     '''
     Converts TeX code to an InsetArgument
     !!! Be careful if the braces are different in your case as expected here:
-    - }{ separates mandatory arguments of commands
+    - "}{" separates mandatory arguments of commands
+    - "}" + "{" separates mandatory arguments of commands
+    - "}" + " " + "{" separates mandatory arguments of commands
     - { and } surround a mandatory argument of an environment
     usage:
-    convert_Argument_to_TeX_brace(document, LineOfBeginLayout, StartArgument, EndArgument, isEnvironment)
+    convert_TeX_brace_to_Argument(document, LineOfBeginLayout/Inset, StartArgument, EndArgument, isInset, isEnvironment)
-    LineOfBeginLayout is the line  of the \begin_layout statement
+    LineOfBeginLayout/Inset is the line  of the \begin_layout or \begin_inset statement
     StartArgument is the number of the first ERT that needs to be converted
     EndArgument is the number of the last ERT that needs to be converted
-    isEnvironment must be true, if the layout id for a LaTeX environment
+    isInset must be true, if braces inside an InsetLayout needs to be converted
+    isEnvironment must be true, if the layout is for a LaTeX environment
     
-    Notes:
+    Note: this routine can currently handle only one mandatory argument of environments
-    - this routine will fail if the user has additional TeX-braces (there is nothing we can do)
-    - this routine can currently handle only one mandatory argument of environments
-    Todo:
-    - support the case that }{ is in the file in 2 separate ERTs
     '''
     lineArg = line
     while lineArg != -1 and n < nmax + 1:
       lineArg = find_token(document.body, "\\begin_inset ERT", lineArg)
       if environment == False and lineArg != -1:
         bracePair = find_token(document.body, "}{", lineArg)
-        # assure that the "}{" is in this ERT (5 is or files saved with LyX 2.0, 4 for files exported by LyX 2.1)
+        # assure that the "}{" is in this ERT
-        if bracePair == lineArg + 5 or bracePair == lineArg + 4:
+        if bracePair == lineArg + 5:
           end = find_token(document.body, "\\end_inset", bracePair)
           document.body[lineArg : end + 1] = ["\\end_layout", "", "\\end_inset"]
           if n == 1:
+            if inset == False:
               document.body[line + 1 : line + 1] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"]
             else:
-            document.body[endn + 1 : endn + 1] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"]
+              document.body[line + 4 : line + 4] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"]
+          else:
+            document.body[endn : endn] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"]
           n = n + 1
           endn = end
+        # now check the case that we have "}" + "{" in two ERTs
+        else:
+          endBrace = find_token(document.body, "}", lineArg)
+          if endBrace == lineArg + 5:
+            beginBrace = find_token(document.body, "{", endBrace)
+            # assure that the ERTs are consecutive (11 or 12 depending if there is a space between the ERTs or not)
+            if beginBrace == endBrace + 11 or beginBrace == endBrace + 12:
+              end = find_token(document.body, "\\end_inset", beginBrace)
+              document.body[lineArg : end + 1] = ["\\end_layout", "", "\\end_inset"]
+              if n == 1:
+                if inset == False:
+                  document.body[line + 1 : line + 1] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"]
+                else:
+                  document.body[line + 4 : line + 4] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"]
+              else:
+                document.body[endn : endn] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"]
+              n = n + 1
+              # set the line where the next argument will be inserted
+              if beginBrace == endBrace + 11:
+                endn = end - 11
+              else:
+                endn = end - 12
           else:
             lineArg = lineArg + 1
       if environment == True and lineArg != -1:
@@ -1441,12 +1465,12 @@ def convert_IEEEtran(document):
       if i != -1:
         i = find_token(document.body, "\\begin_layout Page headings", i)
       if i != -1:
-        convert_Argument_to_TeX_brace(document, i, 1, 1, False)
+        convert_TeX_brace_to_Argument(document, i, 1, 1, False, False)
         i = i + 1
       if j != -1:
         j = find_token(document.body, "\\begin_layout Biography without photo", j)
       if j != -1:
-        convert_Argument_to_TeX_brace(document, j, 1, 1, True)
+        convert_TeX_brace_to_Argument(document, j, 1, 1, False, True)
         j = j + 1
       if k != -1:
         # assure that we don't handle Biography Biography without photo
@@ -1457,7 +1481,7 @@ def convert_IEEEtran(document):
         continue
       if k != -1:
         # the argument we want to convert is the second one
-        convert_Argument_to_TeX_brace(document, k, 2, 2, True)
+        convert_TeX_brace_to_Argument(document, k, 2, 2, False, True)
         k = k + 1
       if i == -1 and j == -1 and k == -1:
         return
@@ -1485,7 +1509,7 @@ def convert_AASTeX(document):
       if i != -1:
         i = find_token(document.body, "\\begin_layout Altaffilation", i)
       if i != -1:
-        convert_Argument_to_TeX_brace(document, i, 1, 1, False)
+        convert_TeX_brace_to_Argument(document, i, 1, 1, False, False)
         i = i + 1
       if i == -1:
         return
@@ -1513,7 +1537,7 @@ def convert_AGUTeX(document):
       if i != -1:
         i = find_token(document.body, "\\begin_layout Author affiliation", i)
       if i != -1:
-        convert_Argument_to_TeX_brace(document, i, 1, 1, False)
+        convert_TeX_brace_to_Argument(document, i, 1, 1, False, False)
         i = i + 1
       if i == -1:
         return
@@ -1541,7 +1565,7 @@ def convert_IJMP(document):
       if i != -1:
         i = find_token(document.body, "\\begin_layout MarkBoth", i)
       if i != -1:
-        convert_Argument_to_TeX_brace(document, i, 1, 1, False)
+        convert_TeX_brace_to_Argument(document, i, 1, 1, False, False)
         i = i + 1
       if i == -1:
         return
@@ -1576,17 +1600,45 @@ def convert_SIGPLAN(document):
       if i != -1:
         i = find_token(document.body, "\\begin_layout Conference", i)
       if i != -1:
-        convert_Argument_to_TeX_brace(document, i, 1, 1, False)
+        convert_TeX_brace_to_Argument(document, i, 1, 1, False, False)
         i = i + 1
       if j != -1:
         j = find_token(document.body, "\\begin_layout Author", j)
       if j != -1:
-        convert_Argument_to_TeX_brace(document, j, 1, 2, False)
+        convert_TeX_brace_to_Argument(document, j, 1, 2, False, False)
         j = j + 1
       if i == -1 and j == -1:
         return
 
 
+def revert_SIGGRAPH(document):
+  " Reverts InsetArgument of Flex CRcat to TeX-code "
+  if document.textclass == "acmsiggraph":
+    i = 0
+    while True:
+      if i != -1:
+        i = find_token(document.body, "\\begin_inset Flex CRcat", i)
+      if i != -1:
+        revert_Argument_to_TeX_brace(document, i, 1, 3, False)
+        i = i + 1
+      if i == -1:
+        return
+
+
+def convert_SIGGRAPH(document):
+  " Converts ERT of Flex CRcat to InsetArgument "
+  if document.textclass == "acmsiggraph":
+    i = 0
+    while True:
+      if i != -1:
+        i = find_token(document.body, "\\begin_inset Flex CRcat", i)
+      if i != -1:
+        convert_TeX_brace_to_Argument(document, i, 1, 3, True, False)
+        i = i + 1
+      if i == -1:
+        return
+
+
 def revert_literate(document):
     " Revert Literate document to old format "
     if del_token(document.header, "noweb", 0):
@@ -1678,7 +1730,7 @@ convert = [
            [444, []],
            [445, []],
            [446, [convert_latexargs]],
-           [447, [convert_IEEEtran, convert_AASTeX, convert_AGUTeX, convert_IJMP, convert_SIGPLAN]],
+           [447, [convert_IEEEtran, convert_AASTeX, convert_AGUTeX, convert_IJMP, convert_SIGPLAN, convert_SIGGRAPH]],
            [448, [convert_literate]],
            [449, []]
           ]
@@ -1686,7 +1738,7 @@ convert = [
 revert =  [
            [448, [revert_itemargs]],
            [447, [revert_literate]],
-           [446, [revert_IEEEtran, revert_AASTeX, revert_AGUTeX, revert_IJMP, revert_SIGPLAN]],
+           [446, [revert_IEEEtran, revert_AASTeX, revert_AGUTeX, revert_IJMP, revert_SIGPLAN, revert_SIGGRAPH]],
            [445, [revert_latexargs]],
            [444, [revert_uop]],
            [443, [revert_biolinum]],

lib/templates/ACM-siggraph.lyx

@@ -3,70 +3,6 @@
 \begin_document
 \begin_header
 \textclass acmsiggraph
-\begin_preamble
-% for the following cases use the listed document class option:
-% [annual] - Technical paper accepted for presentation at the ACM SIGGRAPH 
-%   or SIGGRAPH Asia annual conference.
-% [sponsored] - Short or full-length technical paper accepted for 
-%   presentation at an event sponsored by ACM SIGGRAPH
-%   (but not the annual conference Technical Papers program).
-% [abstract] - A one-page abstract of your accepted content
-%   (Technical Sketches, Posters, Emerging Technologies, etc.). 
-%   Content greater than one page in length should use the "[sponsored]"
-%   parameter.
-% [preprint] - A preprint version of your final content.
-% [review] - A technical paper submitted for review. Includes line
-%   numbers and anonymization of author and affiliation information.
-
-% When you submit your paper for review, please use the \TOGonlineID''
-% command to include the online ID value assigned to your paper by the
-% submission management system. Replace '45678' with the value you were
-% assigned.
-\TOGonlineid{45678}
-
-% If you are preparing a preprint of your accepted paper, and your paper
-% will be published in an issue of the ACM "Transactions on Graphics''
-% journal, replace the "0'' values in the commands below with the correct
-% volume and number values for that issue - you'll get them before your
-% final paper is due.
-\TOGvolume{0}
-\TOGnumber{0}
-
-% The TOGarticleDOI' command accepts the DOI information provided to you
-% during production, and which makes up the URLs which identifies the ACM
-% article page and direct PDF link in the ACM Digital Library.
-% Replace "1111111.2222222'' with the values you are given.
-\TOGarticleDOI{1111111.2222222}
-
-% If you would like to include links to personal repositories for auxiliary
-% material related your research contribution, you may use one or more of
-% these commands to define an appropriate URL. The "\TOGlinkslist'' command
-% found just before the first section of your document will add hyperlinked
-% icons to your document, in addition to hyperlinked icons which point to
-% the ACM Digital Library article page and the ACM Digital Library-held PDF.
-\TOGprojectURL{}
-\TOGvideoURL{}
-\TOGdataURL{}
-\TOGcodeURL{}
-
-% Paper title.
-\title{Global Illumination for Fun and Profit}
-
-% Author and Affiliation (single author).
-%\author{Name \thanks{e-mail: name@unknown.uu}\\ Research Institute}
-
-% Author and Affiliation (multiple authors).
-\author{Roy G. Biv\thanks{e-mail: roy.g.biv@aol.com}\\ Starbucks Research %
-\and Ed Grimley\thanks{e-mail:ed.grimley@aol.com}\\Nigel Mansell\thanks{nigelf1@msn.com}\\ Grimley Widgets, Inc. %
-\and Martha Stewart\thanks{e-mail:martha.stewart@marthastewart.com}\\ Martha Stewart Enterprises \\ Microsoft Research}
-
-% The ``pdfauthor'' command accepts the authors of the work,
-% comma-delimited, and adds this information to the PDF metadata.
-\pdfauthor{Roy G. Biv, Ed Grimley, Nigel Mansell, Martha Stewart}
-
-% Keywords that describe your work.
-\keywords{radiosity, global illumination, constant time}
-\end_preamble
 \options annual
 \use_default_options false
 \maintain_unincluded_children false
@@ -167,26 +103,65 @@ status open
 \series bold
 Note: 
 \series default
- The author, affiliation, email addresses, and the document title have to
+use one of these document class options:
- set up in the LaTeX preamble of this document!
 \end_layout
 
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Note Note
-status open
-
 \begin_layout Plain Layout
 
-\series bold
+\family sans
-Note:
+annual
-\series default
+\family default
- The document type (review etc.) is specified by using one of the document
+ - Technical paper accepted for presentation at the ACM SIGGRAPH or SIGGRAPH
- class options listed in the preamble of this file.
+ Asia annual conference.
+\end_layout
+
+\begin_layout Plain Layout
+
+\family sans
+sponsored
+\family default
+ - Short or full-length technical paper accepted for presentation at an
+ event sponsored by ACM SIGGRAPH (but not the annual conference Technical
+ Papers program).
+\end_layout
+
+\begin_layout Plain Layout
+
+\family sans
+abstract
+\family default
+ - A one-page abstract of your accepted content (Technical Sketches, Posters,
+ Emerging Technologies, etc.).
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset space \hspace*{}
+\length 1.5cm
+\end_inset
+
+Content greater than one page in length should use the document class option
+ 
+\family sans
+sponsored
+\family default
+.
+\end_layout
+
+\begin_layout Plain Layout
+
+\family sans
+preprint
+\family default
+ - A preprint version of your final content.
+\end_layout
+
+\begin_layout Plain Layout
+
+\family sans
+review
+\family default
+ - A technical paper submitted for review.
+ Includes line numbers and anonymization of author and affiliation information.
 \end_layout
 
 \end_inset
@@ -194,6 +169,220 @@ Note:
 
 \end_layout
 
+\begin_layout TOG online ID
+45678
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Should be filled with the online ID value you received when you submitted
+ your technical paper.
+ It will be printed out if you prepare a 
+\family sans
+review
+\family default
+ version of your paper.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout TOG volume
+0
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Optional.
+\end_layout
+
+\begin_layout Plain Layout
+Should your technical paper be accepted, you will be given three pieces
+ of information: the volume and number of the issue of the ACM Transactions
+ on Graphics journal in which your paper will be published, and the ``article
+ DOI'' value, which is unique to your paper and provides the link to your
+ paper's page in the ACM Digital Library.
+ Fill in the volume, number' and article DOI with the three pieces of informatio
+n you receive.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout TOG number
+0
+\end_layout
+
+\begin_layout TOG article DOI
+1111111.2222222
+\end_layout
+
+\begin_layout TOG project URL
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Optional.
+\end_layout
+
+\begin_layout Plain Layout
+By default, your technical paper will contain hyperlinked icons which point
+ to your paper's article page in the ACM Digital Library, and to the paper
+ itself in the ACM Digital Library.
+ You may wish to add one or more links to your own resources.
+ If any of the following four definitions have URLs in them, an appropriate
+ hyperlinked icon will be added to the list.
+ See the note behinf the command 
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout TOG video URL
+
+\end_layout
+
+\begin_layout TOG data URL
+
+\end_layout
+
+\begin_layout TOG code URL
+
+\end_layout
+
+\begin_layout Title
+The Title of Your Paper Goes Here
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Use capital letters as appropriate.
+ Setting the entire title in upper-case letters is not correct, nor is capitaliz
+ing only the first letter of the title.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Author
+Roy Giv
+\begin_inset Flex Thanks
+status open
+
+\begin_layout Plain Layout
+e-mail: roybiv@aol.com
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+Star Research 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+and
+\end_layout
+
+\end_inset
+
+ Ed Grim
+\begin_inset Flex Thanks
+status open
+
+\begin_layout Plain Layout
+e-mail: ed.grim@aol.com
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+Nigel Mall
+\begin_inset Flex Thanks
+status open
+
+\begin_layout Plain Layout
+e-mail: nigelmall@msn.com
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+Grim, Inc.
+ 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+and
+\end_layout
+
+\end_inset
+
+ Robert A.
+ Smith
+\begin_inset Flex Thanks
+status open
+
+\begin_layout Plain Layout
+e-mail: rsmith@gmail.com
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+Smith Research
+\begin_inset Newline newline
+\end_inset
+
+Star Research
+\end_layout
+
+\begin_layout PDF author
+Roy Giv, Ed Grim, Nigel Mall, Robert A.
+ Smith
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+the authors of the work, comma-delimited, are added to the PDF metadata
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Keywords
+radiosity, global illumination, constant time
+\end_layout
+
 \begin_layout Teaser
 \begin_inset Graphics
 	filename ../examples/beamer-icsi-logo.pdf
@@ -202,6 +391,16 @@ Note:
 \end_inset
 
 
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Optional
+\end_layout
+
+\end_inset
+
+ 
 \begin_inset Caption
 
 \begin_layout Plain Layout
@@ -245,16 +444,11 @@ maketitle
 
 
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Plain Layout
-The command 
+Uses the author and title information defined above, and prepares the formatted
-\series bold
+ title.
-
-\backslash
-maketitle
-\series default
- prepares and prints the title block.
 \end_layout
 
 \end_inset
@@ -279,36 +473,11 @@ key "Jobs95"
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Flex ShortCite
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
-
-\backslash
-shortcite
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
 Jobs95
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
@@ -364,7 +533,7 @@ status open
 \begin_layout Plain Layout
 See 
 \begin_inset Flex URL
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -385,69 +554,32 @@ http://www.acm.org/class/1998/
 \begin_inset Flex CRcat
 status open
 
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
 \begin_layout Plain Layout
 K.6.1
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Argument 2
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
 Management of Computing and Information Systems
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Argument 3
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
 Project and People Management
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
 \end_layout
 
 \end_inset
@@ -462,93 +594,46 @@ Life Cycle
 status collapsed
 
 \begin_layout Plain Layout
-The CR categories expects 4 infos that are separated by 
+Consecutive categories must be in the same paragaph separated by a forced
-\begin_inset Quotes eld
+ linebreak.
-\end_inset
-
-
-\series bold
-}{
-\series default
-
-\begin_inset Quotes erd
-\end_inset
-
- in TeX code.
 \end_layout
 
 \end_inset
 
 
-\end_layout
+\begin_inset Newline newline
+\end_inset
+
 
-\begin_layout CR categories
 \begin_inset Flex CRcat
 status open
 
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
 \begin_layout Plain Layout
 K.7.m
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Argument 2
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
 The Computing Profession
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Argument 3
-status collapsed
+status open
 
 \begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
 Miscellaneous
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
 \end_layout
 
 \end_inset
@@ -576,16 +661,10 @@ keywordlist
 
 
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Plain Layout
-The command 
+Prints out the keywords.
-\series bold
-
-\backslash
-keywordlist
-\series default
- prints out the keywords.
 \end_layout
 
 \end_inset
@@ -593,8 +672,33 @@ keywordlist
 
 \end_layout
 
-\begin_layout Section
+\begin_layout Standard
-Introduction
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+TOGlinkslist
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Adds hyperlinked icons to your document.
+ Has only an effect with the document class option 
+\family sans
+annual.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -615,16 +719,9 @@ copyrightspace
 status collapsed
 
 \begin_layout Plain Layout
-When you use a copyright note, the 
+Only necessary if you use a copyright note.
-\series bold
+ It ensures that the copyright space is left at the bottom of the first
-
+ column on the first page of your paper.
-\backslash
-copyrightspace
-\series default
- command must be the first command after the start of the first section
- of the body of your paper.
- It ensures the copyright space is left at the bottom of the first column
- on the first page of your paper.
 \end_layout
 
 \end_inset
@@ -632,6 +729,10 @@ copyrightspace
 
 \end_layout
 
+\begin_layout Section
+Introduction
+\end_layout
+
 \begin_layout Standard
 bla
 \end_layout