From: Uwe Stöhr Date: Tue, 2 Feb 2016 23:03:55 +0000 (+0100) Subject: acmsiggraph.layout: revert c1e0b243 partly X-Git-Tag: 2.2.0beta1~22 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0d30333ec6cc3947c37f19a49c5b5fa8f3812876;p=features.git acmsiggraph.layout: revert c1e0b243 partly --- diff --git a/development/FORMAT b/development/FORMAT index a36855bbf4..1d24d92937 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -18,8 +18,8 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx. 2016-01-26 Uwe Stöhr * Format incremented to 505 - No new parameters. - Convert acmsiggraph.layout to ACM siggraph version 0.92. + This was a conversion of acmsiggraph.layout to ACM siggraph version 0.92. + This was reverted after format 506 on 2016-02-03. 2015-12-20 Guillaume Munch * Format incremented to 504 diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index db00de356c..388b1dd3c1 100644 --- a/lib/layouts/acmsiggraph.layout +++ b/lib/layouts/acmsiggraph.layout @@ -96,51 +96,39 @@ Style "TOG number" End -Style "Set_copyright" +Style "TOG article DOI" CopyStyle "TOG online ID" - LatexName setcopyright - LabelString "Copyright type:" + LatexName TOGarticleDOI + LabelString "Article DOI:" End -Style "Copyright_year" +Style "TOG project URL" CopyStyle "TOG online ID" - LatexName copyrightyear - LabelString "Year of copyright:" + LatexName TOGprojectURL + KeepEmpty 1 + LabelString "Project URL:" End -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:" +Style "TOG video URL" + CopyStyle "TOG project URL" + LatexName TOGvideoURL + LabelString "Video URL:" End -Style "DOI" - CopyStyle "TOG online ID" - LatexName doi - LabelString "Article DOI:" +Style "TOG data URL" + CopyStyle "TOG project URL" + LatexName TOGdataURL + LabelString "Data URL:" End -Style "TOG article DOI" - CopyStyle "TOG online ID" - LatexName TOGarticleDOI - LabelString "Article DOI:" - ObsoletedBy DOI +Style "TOG code URL" + CopyStyle "TOG project URL" + LatexName TOGcodeURL + LabelString "Code URL:" End @@ -167,39 +155,20 @@ End Style "PDF author" - CopyStyle "TOG online ID" + CopyStyle "TOG project URL" LatexName pdfauthor LabelString "PDF author:" End Style Keywords - CopyStyle "TOG online ID" + CopyStyle "TOG project URL" LatexName keywords LabelType Static LabelString "Keywords:" -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" + LabelFont + Series Bold + Size Normal + EndFont End @@ -208,7 +177,6 @@ Style Teaser LatexType Command LatexName teaser Category FrontMatter - InTitle 1 ParSkip 0.4 BottomSep 0.5 Align Left diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py index 35aedd8a43..a1f3005d7e 100644 --- a/lib/lyx2lyx/lyx_2_2.py +++ b/lib/lyx2lyx/lyx_2_2.py @@ -2201,110 +2201,6 @@ 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 - - def convert_info_tabular_feature(document): def f(arg): return arg.replace("inset-modify tabular", "tabular-feature") @@ -2356,7 +2252,7 @@ convert = [ [502, []], [503, []], [504, [convert_save_props]], - [505, [convert_ACM_siggraph]], + [505, []], [506, [convert_info_tabular_feature]] ] diff --git a/lib/templates/ACM-siggraph.lyx b/lib/templates/ACM-siggraph.lyx index b2f64ac700..3a653701d4 100644 --- a/lib/templates/ACM-siggraph.lyx +++ b/lib/templates/ACM-siggraph.lyx @@ -71,31 +71,6 @@ \end_header \begin_body -\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 - \begin_layout Standard \begin_inset Note Note @@ -199,6 +174,26 @@ review \end_inset +\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 @@ -227,6 +222,13 @@ 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 @@ -234,9 +236,31 @@ 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 @@ -278,7 +302,7 @@ status collapsed \backslash -and +and \end_layout \end_inset @@ -320,7 +344,7 @@ status collapsed \backslash -and +and \end_layout \end_inset @@ -360,121 +384,12 @@ the authors of the work, comma-delimited, are added to the PDF metadata \end_inset -\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" @@ -502,32 +417,10 @@ remove this box by an image \begin_inset Note Note -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 +status open \begin_layout Plain Layout - - -\backslash -maketitle -\end_layout - -\end_inset - - -\begin_inset Newline newline -\end_inset - -instead of the Teaser image style. +Optional \end_layout \end_inset @@ -560,6 +453,33 @@ Lookit! Lookit! \end_inset +\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 @@ -637,21 +557,18 @@ key "whole-set" status open \begin_layout Plain Layout -The content of the following \SpecialChar TeX - code must be generated by the tool at +See \begin_inset Flex URL status open \begin_layout Plain Layout -http://dl.acm.org/ccs.cfm +http://www.siggraph.org/sites/default/files/acmsiggraph.zip \end_layout \end_inset -. - Please copy and paste the code you created there instead of the example - code below. + for details about the ACM Computing Review categories. \end_layout \end_inset @@ -659,50 +576,95 @@ http://dl.acm.org/ccs.cfm \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed +\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.6.1 +\end_layout -\backslash -begin{CCSXML} +\end_inset + + +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +Management of Computing and Information Systems \end_layout +\end_inset + + +\begin_inset Argument 3 +status open + \begin_layout Plain Layout +Project and People Management +\end_layout - 10010147.10010371.10010382 Computing methodologies~Image manipulation 500 10010147.10010371. -10010382.10010236 Computing methodologies~Computationa -l photography 300 - +\end_inset + +Life Cycle \end_layout -\begin_layout Plain Layout +\end_inset -\backslash -end{CCSXML} +\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 -\begin_layout Plain Layout +\end_inset -\backslash -ccsdesc[500]{Computing methodologies~Image manipulation} +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +The Computing Profession \end_layout +\end_inset + + +\begin_inset Argument 3 +status open + \begin_layout Plain Layout +Miscellaneous +\end_layout +\end_inset -\backslash -ccsdesc[300]{Computing methodologies~Computational photography} +Ethics \end_layout \end_inset @@ -710,12 +672,25 @@ ccsdesc[300]{Computing methodologies~Computational photography} \end_layout -\begin_layout Keyword list +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +keywordlist +\end_layout + +\end_inset + + \begin_inset Note Note status collapsed \begin_layout Plain Layout -Prints the keywords, keep it empty! +Prints out the keywords. \end_layout \end_inset @@ -723,12 +698,28 @@ Prints the keywords, keep it empty! \end_layout -\begin_layout Concept list +\begin_layout Standard +\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 -Prints the CCS concepts list, keep it empty! +Adds hyperlinked icons to your document. + Has only an effect with the document class option +\family sans +annual. \end_layout \end_inset @@ -736,12 +727,27 @@ Prints the CCS concepts list, keep it empty! \end_layout -\begin_layout Print copyright +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +% +\backslash +copyrightspace +\end_layout + +\end_inset + + \begin_inset Note Note status collapsed \begin_layout Plain Layout -Prints the copyright info, keep it empty! +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. \end_layout \end_inset