Am 24.01.2016 um 19:14 schrieb Scott Kostyshak:
Can anyone reproduce? It would be nice to know if we need to update our
layout.
Yes, I can. The ACM people changes almost everything in the preamble
handling with acmsiggraph version 0.92. Some commands have completely
been removed and new ones have been added.
Attached is a patch to support the latest version of acmsiggraph. It is
of course a fileformat change. We cannot do much via lyx2lyx, except of
removing the now nonexistent styles with unnecessary and unwanted
information. To tell the user that he must update his file further on, I
add via lyx2lyx a red note explaining this.
The updated LyX template file reflects the current state of acmsiggraph.
If a user wants to submit a paper he MUST follow this template and
modify his file accordingly.
A reversion (e.g. from LyX 2.2.x to 2.1.x doesn't make sense since the
layout in LyX 2.1.x is not compatible with acmsiggraph anymore and the
user must write according to the latest acmsiggraph.
As this is a fileformat change it should go in before the beta release.
I will have a look. As the maintainer of this file my plan was to check the
examples with the latest class versions in the beta cycle nevertheless.
That is a good idea. Thanks for doing that.
I did this today and only found some missing dependencies in some layouts.
regards Uwe
development/FORMAT | 5 +
lib/layouts/acmsiggraph.layout | 82 +++++++---
lib/lyx2lyx/LyX.py | 2 +-
lib/lyx2lyx/lyx_2_2.py | 108 +++++++++++-
lib/templates/ACM-siggraph.lyx | 363 +++++++++++++++++++----------------------
src/version.h | 4 +-
6 files changed, 338 insertions(+), 226 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index cbd5064..0c8a98c 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,11 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
-----------------------
+2016-01-26 Uwe Stöhr <uwesto...@web.de>
+ * Format incremented to 505
+ No new parameters.
+ Convert acmsiggraph.layout to ACM siggraph version 0.92.
+
2015-12-20 Guillaume Munch <g...@lyx.org>
* Format incremented to 504
New parameter "\save_transient_properties". When set to false, various
diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout
index 388b1dd..db00de3 100644
--- a/lib/layouts/acmsiggraph.layout
+++ b/lib/layouts/acmsiggraph.layout
@@ -96,39 +96,51 @@ Style "TOG number"
End
-Style "TOG article DOI"
+Style "Set_copyright"
CopyStyle "TOG online ID"
- LatexName TOGarticleDOI
- LabelString "Article DOI:"
+ LatexName setcopyright
+ LabelString "Copyright type:"
End
-Style "TOG project URL"
+Style "Copyright_year"
CopyStyle "TOG online ID"
- LatexName TOGprojectURL
- KeepEmpty 1
- LabelString "Project URL:"
+ LatexName copyrightyear
+ LabelString "Year of copyright:"
End
-Style "TOG video URL"
- CopyStyle "TOG project URL"
- LatexName TOGvideoURL
- LabelString "Video URL:"
+Style "Conference_info"
+ CopyStyle "TOG online ID"
+ LatexName conferenceinfo
+ LabelString "Conference info:"
+ Argument 1
+ Mandatory 1
+ LabelString "Name"
+ Tooltip "Conference name"
+ EndArgument
+End
+
+
+Style "ISBN"
+ CopyStyle "TOG online ID"
+ LatexName isbn
+ LabelString "ISBN:"
End
-Style "TOG data URL"
- CopyStyle "TOG project URL"
- LatexName TOGdataURL
- LabelString "Data URL:"
+Style "DOI"
+ CopyStyle "TOG online ID"
+ LatexName doi
+ LabelString "Article DOI:"
End
-Style "TOG code URL"
- CopyStyle "TOG project URL"
- LatexName TOGcodeURL
- LabelString "Code URL:"
+Style "TOG article DOI"
+ CopyStyle "TOG online ID"
+ LatexName TOGarticleDOI
+ LabelString "Article DOI:"
+ ObsoletedBy DOI
End
@@ -155,20 +167,39 @@ End
Style "PDF author"
- CopyStyle "TOG project URL"
+ CopyStyle "TOG online ID"
LatexName pdfauthor
LabelString "PDF author:"
End
Style Keywords
- CopyStyle "TOG project URL"
+ CopyStyle "TOG online ID"
LatexName keywords
LabelType Static
LabelString "Keywords:"
- LabelFont
- Series Bold
- Size Normal
- EndFont
+End
+
+
+Style "Keyword_list"
+ CopyStyle "TOG online ID"
+ LatexName keywordlist
+ InPreamble 0
+ KeepEmpty 1
+ LabelString "Keyword list"
+End
+
+
+Style "Concept_list"
+ CopyStyle "Keyword_list"
+ LatexName conceptlist
+ LabelString "Concept list"
+End
+
+
+Style "Print_copyright"
+ CopyStyle "Keyword_list"
+ LatexName printcopyright
+ LabelString "Print copyright"
End
@@ -177,6 +208,7 @@ Style Teaser
LatexType Command
LatexName teaser
Category FrontMatter
+ InTitle 1
ParSkip 0.4
BottomSep 0.5
Align Left
diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 6bc0fb6..047dc9b 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -86,7 +86,7 @@ format_relation = [("0_06", [200], minor_versions("0.6" ,
4)),
("1_6", list(range(277,346)), minor_versions("1.6" , 10)),
("2_0", list(range(346,414)), minor_versions("2.0" , 8)),
("2_1", list(range(414,475)), minor_versions("2.1" , 0)),
- ("2_2", list(range(475,505)), minor_versions("2.2" , 0))
+ ("2_2", list(range(475,506)), minor_versions("2.2" , 0))
]
####################################################################
diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index ece452d..48962c3 100644
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -2201,6 +2201,110 @@ def revert_save_props(document):
del document.header[i]
+def delete_TOG_project_URL(document):
+ i = 0
+ j = 0
+ while True:
+ # delete the TOG project URL
+ i = find_token(document.body, "\\begin_layout TOG project URL", i)
+ if i != -1:
+ j = find_end_of_layout(document.body, i + 1)
+ else:
+ return
+ if j != -1:
+ del(document.body[i : j + 1])
+ else:
+ document.warning("Malformed LyX document: Can't find end of layout
TOG project URL")
+ return
+ i += 1
+
+
+def delete_TOG_video_URL(document):
+ i = 0
+ j = 0
+ while True:
+ # delete the TOG video URL
+ i = find_token(document.body, "\\begin_layout TOG video URL", i)
+ if i != -1:
+ j = find_end_of_layout(document.body, i)
+ else:
+ return
+ if j != -1:
+ del(document.body[i : j + 1])
+ else:
+ document.warning("Malformed LyX document: Can't find end of layout
TOG video URL")
+ return
+ i += 1
+
+
+def delete_TOG_data_URL(document):
+ i = 0
+ j = 0
+ while True:
+ # delete the TOG video URL
+ i = find_token(document.body, "\\begin_layout TOG data URL", i)
+ if i != -1:
+ j = find_end_of_layout(document.body, i)
+ else:
+ return
+ if j != -1:
+ del(document.body[i : j + 1])
+ else:
+ document.warning("Malformed LyX document: Can't find end of layout
TOG data URL")
+ return
+ i += 1
+
+
+def delete_TOG_code_URL(document):
+ i = 0
+ j = 0
+ while True:
+ # delete the TOG video URL
+ i = find_token(document.body, "\\begin_layout TOG code URL", i)
+ if i != -1:
+ j = find_end_of_layout(document.body, i)
+ else:
+ return
+ if j != -1:
+ del(document.body[i : j + 1])
+ else:
+ document.warning("Malformed LyX document: Can't find end of layout
TOG code URL")
+ return
+ i += 1
+
+
+def convert_ACM_siggraph(document):
+ " Convert to version 0.92 of acmsiggraph. "
+ if document.textclass != "acmsiggraph":
+ return
+ # at first delete the now nonexistent styles since their info is now
+ # not needed and even unwanted
+ delete_TOG_project_URL(document)
+ delete_TOG_video_URL(document)
+ delete_TOG_data_URL(document)
+ delete_TOG_code_URL(document)
+ # now add a note that the user knows that he still has work to do
+ note = ["\\begin_layout Standard", "\\begin_inset Note Note", "status
open", "",
+ "\\begin_layout Plain Layout", "", "\\series bold",
+ "\\color red", "Important note:", "\series default",
+ " This file was converted by \\SpecialChar LyX to the format of
acmsigplan 0.92.",
+ " This conversion is incomplete because you must add new
information about",
+ " your article.",
+ " To see what is required, open the \\SpecialChar LyX template
file ",
+ "\\family sans",
+ "ACM-siggraph.lyx",
+ "\\family default",
+ ".",
+ "\\end_layout",
+ "",
+ "\\end_inset",
+ "",
+ "",
+ "\\end_layout",
+ ""]
+ document.body[1:1] = note
+
+
##
# Conversion hub
#
@@ -2239,10 +2343,12 @@ convert = [
[501, [convert_fontsettings]],
[502, []],
[503, []],
- [504, [convert_save_props]]
+ [504, [convert_save_props]],
+ [505, [convert_ACM_siggraph]]
]
revert = [
+ [504, [revert_save_props]],
[503, [revert_save_props]],
[502, [revert_verbatim_star]],
[501, [revert_solution]],
diff --git a/lib/templates/ACM-siggraph.lyx b/lib/templates/ACM-siggraph.lyx
index 8be089b..2fc5a44 100644
--- a/lib/templates/ACM-siggraph.lyx
+++ b/lib/templates/ACM-siggraph.lyx
@@ -176,26 +176,6 @@ review
\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
@@ -222,13 +202,6 @@ n you receive.
\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
@@ -236,33 +209,11 @@ status collapsed
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
@@ -302,7 +253,7 @@ status collapsed
\backslash
-and
+and
\end_layout
\end_inset
@@ -344,7 +295,7 @@ status collapsed
\backslash
-and
+and
\end_layout
\end_inset
@@ -386,10 +337,119 @@ the authors of the work, comma-delimited, are added to
the PDF metadata
\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 Keywords
radiosity, global illumination, constant time
\end_layout
+\begin_layout Set copyright
+rightsretained
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+You can choose between the copyright types
+\family sans
+none
+\family default
+,
+\family sans
+acmcopyright
+\family default
+,
+\family sans
+acmlicensed
+\family default
+,
+\family sans
+rightsretained
+\family default
+,
+\family sans
+usgov
+\family default
+,
+\family sans
+usgovmixed
+\family default
+,
+\family sans
+cagov
+\family default
+ and
+\family sans
+cagovmixed
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Copyright year
+2016
+\end_layout
+
+\begin_layout Conference info
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+SIGGRAPH 2016 Posters
+\end_layout
+
+\end_inset
+
+July 24-28, 2016, Anaheim, CA
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+conference date and location
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout ISBN
+978-1-4503-ABCD-E/16/07
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+includes the year and month after the article ISBN
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout DOI
+1111111.2222222
+\end_layout
+
\begin_layout Teaser
\begin_inset Box Boxed
position "t"
@@ -417,10 +477,32 @@ remove this box by an image
\begin_inset Note Note
-status open
+status collapsed
+
+\begin_layout Plain Layout
+Optional.
+ If not used, you must use this:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
\begin_layout Plain Layout
-Optional
+
+
+\backslash
+maketitle
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+instead of the Teaser image style.
\end_layout
\end_inset
@@ -455,33 +537,6 @@ Lookit! Lookit!
\end_layout
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-maketitle
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-Uses the author and title information defined above, and prepares the formatted
- title.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
\begin_layout Abstract
Citations can be done this way
\begin_inset space ~
@@ -557,18 +612,21 @@ key "whole-set"
status open
\begin_layout Plain Layout
-See
+The content of the following \SpecialChar TeX
+ code must be generated by the tool at
\begin_inset Flex URL
status open
\begin_layout Plain Layout
-http://www.siggraph.org/sites/default/files/acmsiggraph.zip
+http://dl.acm.org/ccs.cfm
\end_layout
\end_inset
- for details about the ACM Computing Review categories.
+.
+ Please copy and paste the code you created there instead of the example
+ code below.
\end_layout
\end_inset
@@ -576,121 +634,63 @@
http://www.siggraph.org/sites/default/files/acmsiggraph.zip
\end_layout
-\begin_layout CR categories
-\begin_inset Flex CRcat
-status open
-
-\begin_layout Plain Layout
-\begin_inset Argument 1
-status open
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
\begin_layout Plain Layout
-K.6.1
-\end_layout
-
-\end_inset
-
-\begin_inset Argument 2
-status open
-\begin_layout Plain Layout
-Management of Computing and Information Systems
+\backslash
+begin{CCSXML}
\end_layout
-\end_inset
-
-
-\begin_inset Argument 3
-status open
-
\begin_layout Plain Layout
-Project and People Management
-\end_layout
-
-\end_inset
-Life Cycle
+<ccs2012> <concept> <concept_id>10010147.10010371.10010382</concept_id>
<concept_d
+esc>Computing methodologies~Image manipulation</concept_desc>
<concept_significa
+nce>500</concept_significance> </concept> <concept>
<concept_id>10010147.10010371.
+10010382.10010236</concept_id> <concept_desc>Computing
methodologies~Computationa
+l photography</concept_desc> <concept_significance>300</concept_significance>
+ </concept> </ccs2012>
\end_layout
-\end_inset
-
-
-\begin_inset Note Note
-status collapsed
-
\begin_layout Plain Layout
-Consecutive categories must be in the same paragaph separated by a forced
- linebreak.
-\end_layout
-\end_inset
-
-
-\begin_inset Newline newline
-\end_inset
-
-
-\begin_inset Flex CRcat
-status open
-
-\begin_layout Plain Layout
-\begin_inset Argument 1
-status open
-
-\begin_layout Plain Layout
-K.7.m
-\end_layout
-
-\end_inset
-
-\begin_inset Argument 2
-status open
-
-\begin_layout Plain Layout
-The Computing Profession
+\backslash
+end{CCSXML}
\end_layout
-\end_inset
-
-
-\begin_inset Argument 3
-status open
-
\begin_layout Plain Layout
-Miscellaneous
-\end_layout
-
-\end_inset
-Ethics
\end_layout
-\end_inset
+\begin_layout Plain Layout
+\backslash
+ccsdesc[500]{Computing methodologies~Image manipulation}
\end_layout
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
\begin_layout Plain Layout
\backslash
-keywordlist
+ccsdesc[300]{Computing methodologies~Computational photography}
\end_layout
\end_inset
+\end_layout
+
+\begin_layout Keyword list
\begin_inset Note Note
status collapsed
\begin_layout Plain Layout
-Prints out the keywords.
+Prints the keywords, keep it empty!
\end_layout
\end_inset
@@ -698,28 +698,12 @@ Prints out the keywords.
\end_layout
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-TOGlinkslist
-\end_layout
-
-\end_inset
-
-
+\begin_layout Concept list
\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.
+Prints the CCS concepts list, keep it empty!
\end_layout
\end_inset
@@ -727,27 +711,12 @@ annual.
\end_layout
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-%
-\backslash
-copyrightspace
-\end_layout
-
-\end_inset
-
-
+\begin_layout Print copyright
\begin_inset Note Note
status collapsed
\begin_layout Plain Layout
-Only necessary if you use a copyright note.
- It ensures that the copyright space is left at the bottom of the first
- column on the first page of your paper.
+Prints the copyright info, keep it empty!
\end_layout
\end_inset
diff --git a/src/version.h b/src/version.h
index 3f571d1..5155341 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 504 // gm: add save_transient_properties parameter
-#define LYX_FORMAT_TEX2LYX 504
+#define LYX_FORMAT_LYX 505 // uwestoehr: new format for ACM siggraaph
+#define LYX_FORMAT_TEX2LYX 505
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER
