On Wed, 27 Aug 2003, John Levon wrote: > > John, how do I create a patch? > > We should give you a CVS account so you can do a proper patch by "cvs > add"ing the new files. Then from the top lyx directory, you do > > cvs diff -Nup >mypatch.diff
Who should I contact about the CVS account? In case anyone wants to look at it, I've attached a patch file (as per above), and I also attached an archive with the the new files that need to added. > > This was done for 1.3.2, I thought I'd start with something that > > works and doesn't change all the time, i.e. lyx-CVS. > > Frankly, I think it's time we started backporting the work we did in lyx > CVS before the destruction of the tree anyway ... > Judging by the traffic on lyx-devel, it certainly seems to be in a state of flux :-) > > Anyway, now I thought I'd try and apply a patch of this to the latest > > version, is that correct? > > Sure, but you'll need to make some changes obviously :) > I'll just start asking questions if/when I run into problems... /Christian -- Christian Ridderström http://www.md.kth.se/~chr
? build-qt ? build-xforms ? listings ? newfile1.lyx ? src/frontends/controllers/ControlListing.C ? src/frontends/controllers/ControlListing.h ? src/frontends/xforms/FormListing.C ? src/frontends/xforms/FormListing.h ? src/frontends/xforms/forms/form_listing.fd ? src/insets/insetlisting.C ? src/insets/insetlisting.h Index: lib/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/lib/ChangeLog,v retrieving revision 1.363.2.37 diff -u -p -r1.363.2.37 ChangeLog --- lib/ChangeLog 2003/08/12 07:12:33 1.363.2.37 +++ lib/ChangeLog 2003/08/27 08:08:56 @@ -1,3 +1,10 @@ +2003-08-26 Christian Ridderström <[EMAIL PROTECTED]> + (original patch by Herbert Voss <[EMAIL PROTECTED]>) + + * doc/LaTeXConfig.lyx.in: + * doc/LyXConfig.lyx.in: + * ui/default.ui: + 2003-08-09 Juergen Spitzmueller <[EMAIL PROTECTED]> * templates/koma-letter2.lyx: typo. Index: lib/chkconfig.ltx =================================================================== RCS file: /cvs/lyx/lyx-devel/lib/chkconfig.ltx,v retrieving revision 1.9.6.1 diff -u -p -r1.9.6.1 chkconfig.ltx --- lib/chkconfig.ltx 2003/02/14 21:37:47 1.9.6.1 +++ lib/chkconfig.ltx 2003/08/27 08:08:56 @@ -224,6 +224,7 @@ \TestPackage{url} \TestPackage{varioref} \TestPackage{prettyref} +\TestPackage{listings} \TestPackage{natbib} % The test for the graphics package is slightly more involved... Index: lib/doc/LaTeXConfig.lyx.in =================================================================== RCS file: /cvs/lyx/lyx-devel/lib/doc/LaTeXConfig.lyx.in,v retrieving revision 1.26.2.5 diff -u -p -r1.26.2.5 LaTeXConfig.lyx.in --- lib/doc/LaTeXConfig.lyx.in 2003/03/03 16:04:15 1.26.2.5 +++ lib/doc/LaTeXConfig.lyx.in 2003/08/27 08:08:57 @@ -1929,4 +1929,25 @@ Notes: The package url \family default is needed by LyX to be able to output url's corrently. + +\layout Subsection + +listings +\layout Description + +Found: @chk_listings@ +\layout Description + +CTAN: +\family typewriter +macros/latex/contrib/other/misc/listings.sty +\layout Description + +Notes: The package +\family sans +listings +\family default + is needed by LyX to be able to output program listings + + \the_end Index: lib/doc/LyXConfig.lyx.in =================================================================== RCS file: /cvs/lyx/lyx-devel/lib/doc/LyXConfig.lyx.in,v retrieving revision 1.4.2.1 diff -u -p -r1.4.2.1 LyXConfig.lyx.in --- lib/doc/LyXConfig.lyx.in 2003/03/03 16:04:15 1.4.2.1 +++ lib/doc/LyXConfig.lyx.in 2003/08/27 08:08:58 @@ -1354,6 +1354,26 @@ url is needed by LyX to be able to output url's corrently. \layout Subsection +listings +\layout Description + +Found: @chk_listings@ +\layout Description + +CTAN: +\family typewriter +macros/latex/contrib/other/misc/listings.sty +\layout Description + +Notes: The package +\family sans +listings +\family default + is needed by LyX to be able to output program listings + + +\layout Subsection + prettyref \layout Description Index: lib/ui/default.ui =================================================================== RCS file: /cvs/lyx/lyx-devel/lib/ui/default.ui,v retrieving revision 1.107 diff -u -p -r1.107 default.ui --- lib/ui/default.ui 2003/01/16 10:41:13 1.107 +++ lib/ui/default.ui 2003/08/27 08:08:59 @@ -211,6 +211,7 @@ Menuset Item "Tabular Material...|b" "tabular-insert" Submenu "Floats|a" "insert_floats" Separator + Item "Program Listing" "listing-insert" Item "Include File...|d" "buffer-child-insert" Submenu "Insert File|e" "insert_file" Item "External Material...|x" "external-insert" Index: po/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/po/ChangeLog,v retrieving revision 1.156.2.31 diff -u -p -r1.156.2.31 ChangeLog --- po/ChangeLog 2003/07/08 16:51:40 1.156.2.31 +++ po/ChangeLog 2003/08/27 08:09:00 @@ -1,3 +1,8 @@ +2003-08-26 Christian Ridderström <[EMAIL PROTECTED]> + (original patch by Herbert Voss <[EMAIL PROTECTED]>) + + * POTFILES.in: + 2003-07-07 Adrien Rebollo <[EMAIL PROTECTED]> * fr.po: update Index: po/POTFILES.in =================================================================== RCS file: /cvs/lyx/lyx-devel/po/POTFILES.in,v retrieving revision 1.314.2.1 diff -u -p -r1.314.2.1 POTFILES.in --- po/POTFILES.in 2003/05/27 12:45:51 1.314.2.1 +++ po/POTFILES.in 2003/08/27 08:09:00 @@ -21,6 +21,7 @@ src/frontends/controllers/ControlDocumen src/frontends/controllers/ControlExternal.C src/frontends/controllers/ControlGraphics.C src/frontends/controllers/ControlInclude.C +src/frontends/controllers/ControlListing.C src/frontends/controllers/ControlParagraph.C src/frontends/controllers/ControlPreamble.C src/frontends/controllers/ControlPrefs.C @@ -53,7 +54,6 @@ src/frontends/qt2/QExternal.C src/frontends/qt2/QExternalDialog.C src/frontends/qt2/QFloat.C src/frontends/qt2/QGraphics.C -src/frontends/qt2/QGraphicsDialog.C src/frontends/qt2/QInclude.C src/frontends/qt2/QIndex.C src/frontends/qt2/QLPrintDialog.C @@ -99,6 +99,7 @@ src/frontends/xforms/FormForks.C src/frontends/xforms/FormGraphics.C src/frontends/xforms/FormInclude.C src/frontends/xforms/FormIndex.C +src/frontends/xforms/FormListing.C src/frontends/xforms/FormLog.C src/frontends/xforms/FormMathsBitmap.C src/frontends/xforms/FormMathsDelim.C Index: src/BufferView_pimpl.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/BufferView_pimpl.C,v retrieving revision 1.322 diff -u -p -r1.322 BufferView_pimpl.C --- src/BufferView_pimpl.C 2003/01/23 16:23:35 1.322 +++ src/BufferView_pimpl.C 2003/08/27 08:09:01 @@ -44,6 +44,7 @@ #include "insets/insetbib.h" #include "insets/insettext.h" +#include "insets/insetlisting.h" #include "insets/insetlatexaccent.h" #include "insets/insettoc.h" #include "insets/insetindex.h" @@ -1150,6 +1151,24 @@ bool BufferView::Pimpl::dispatch(FuncReq } break; + case LFUN_INSERT_LISTING: + { + if (ev.argument.empty()) { + owner_->getDialogs().createListing(); + break; + } + + InsetCommandParams p; + p.setFromString(ev.argument); + + InsetListing * inset = new InsetListing(p); + if (!insertInset(inset)) + delete inset; + else + updateInset(inset, true); + } + break; + case LFUN_INSERT_BIBTEX: { // ale970405+lasgoutt970425 Index: src/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/src/ChangeLog,v retrieving revision 1.1021.2.19 diff -u -p -r1.1021.2.19 ChangeLog --- src/ChangeLog 2003/07/22 16:01:52 1.1021.2.19 +++ src/ChangeLog 2003/08/27 08:09:08 @@ -1,3 +1,13 @@ +2003-08-26 Christian Ridderström <[EMAIL PROTECTED]> + (original patch by Herbert Voss <[EMAIL PROTECTED]>) + + * BufferView_pimpl.C: + * LatexFeatures.C: + * LyXAction.C + * buffer.C: + * commandtags.h: add support for package listings + (insert formatted sourcecode) + 2003-07-22 John Levon <[EMAIL PROTECTED]> * Thesaurus.h: use the right aiksaurus header Index: src/LaTeXFeatures.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/LaTeXFeatures.C,v retrieving revision 1.74 diff -u -p -r1.74 LaTeXFeatures.C --- src/LaTeXFeatures.C 2002/11/27 10:30:04 1.74 +++ src/LaTeXFeatures.C 2003/08/27 08:09:08 @@ -170,10 +170,11 @@ char const * simplefeatures[] = { "latexsym", "pifont", "subfigure", + "float", "floatflt", "varioref", "prettyref", - "float", + "listings", "wasy" }; Index: src/LyXAction.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/LyXAction.C,v retrieving revision 1.144 diff -u -p -r1.144 LyXAction.C --- src/LyXAction.C 2003/01/06 14:02:20 1.144 +++ src/LyXAction.C 2003/08/27 08:09:09 @@ -406,8 +406,10 @@ void LyXAction::init() { LFUN_ESCAPE, "escape", "", Noop }, { LFUN_HELP_ABOUTLYX, "help-aboutlyx", N_("Display information about LyX"), NoBuffer }, - { LFUN_HELP_TEXINFO, "help-Texinfo", + { LFUN_HELP_TEXINFO, "help-Texinfo", N_("Display information about the TeX installation"), NoBuffer }, + { LFUN_INSERT_LISTING, "listing-insert", + N_("Inserts formatted sourcecode"), Noop }, { LFUN_FORKS_SHOW, "show-forks", N_("Show the processes forked by LyX"), NoBuffer }, { LFUN_FORKS_KILL, "kill-forks", Index: src/buffer.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/buffer.C,v retrieving revision 1.399.2.4 diff -u -p -r1.399.2.4 buffer.C --- src/buffer.C 2003/06/06 19:17:59 1.399.2.4 +++ src/buffer.C 2003/08/27 08:09:11 @@ -54,6 +54,7 @@ #include "insets/inset.h" #include "insets/inseterror.h" #include "insets/insetlabel.h" +#include "insets/insetlisting.h" #include "insets/insetref.h" #include "insets/inseturl.h" #include "insets/insetnote.h" @@ -1070,6 +1071,8 @@ void Buffer::readInset(LyXLex & lex, Par } else if (cmdName == "url" || cmdName == "htmlurl") { inset = new InsetUrl(inscmd); + } else if (cmdName == "lstinputlisting") { + inset = new InsetListing(inscmd); } else if (cmdName == "ref" || cmdName == "pageref" || cmdName == "vref" Index: src/commandtags.h =================================================================== RCS file: /cvs/lyx/lyx-devel/src/Attic/commandtags.h,v retrieving revision 1.104 diff -u -p -r1.104 commandtags.h --- src/commandtags.h 2002/11/29 13:22:38 1.104 +++ src/commandtags.h 2003/08/27 08:09:12 @@ -278,7 +278,8 @@ enum kb_action { LFUN_ESCAPE, // 260 // Lgb 20010517 LFUN_HELP_ABOUTLYX, // Edwin 20010712 LFUN_THESAURUS_ENTRY, // Levon 20010720 - LFUN_HELP_TEXINFO, // Herbert 20011001 + LFUN_HELP_TEXINFO, // Herbert 20011001 + LFUN_INSERT_LISTING, // Herbert 20011110 LFUN_FORKS_SHOW, // Angus 16 Feb 2002 LFUN_FORKS_KILL, // Angus 16 Feb 2002 LFUN_TOOLTIPS_TOGGLE, // Angus 8 Mar 2002 Index: src/frontends/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/ChangeLog,v retrieving revision 1.148 diff -u -p -r1.148 ChangeLog --- src/frontends/ChangeLog 2003/01/14 21:51:33 1.148 +++ src/frontends/ChangeLog 2003/08/27 08:09:13 @@ -1,3 +1,9 @@ +2003-08-26 Christian Ridderström <[EMAIL PROTECTED]> + (original patch by Herbert Voss <[EMAIL PROTECTED]>) + + * Dialogs.[Ch]: new gui for inserting sourcecode into a lyxdoc + * guiapi.[Ch] + 2003-01-11 Juergen Spitzmueller <[EMAIL PROTECTED]> * FileDialog.h: implement opendir (browse directory) [bug 824] Index: src/frontends/Dialogs.h =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/Dialogs.h,v retrieving revision 1.65 diff -u -p -r1.65 Dialogs.h --- src/frontends/Dialogs.h 2002/09/10 10:18:57 1.65 +++ src/frontends/Dialogs.h 2003/08/27 08:09:13 @@ -34,6 +34,7 @@ class InsetWrap; class InsetGraphics; class InsetInclude; class InsetInfo; +class InsetListing; class InsetMinipage; class Paragraph; class InsetTabular; @@ -122,6 +123,10 @@ public: void showIndex(InsetCommand *); /// void createIndex(); + /// show source listing dialog + void showListing(InsetCommand *); + /// create source listing inset and show dialog + void createListing(); /// show the LaTeX log or build file void showLogFile(); /// display the top-level maths panel Index: src/frontends/guiapi.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/guiapi.C,v retrieving revision 1.6 diff -u -p -r1.6 guiapi.C --- src/frontends/guiapi.C 2002/12/01 22:59:18 1.6 +++ src/frontends/guiapi.C 2003/08/27 08:09:13 @@ -138,6 +138,16 @@ extern "C" { } + void gui_ShowListing(InsetCommand * ic, Dialogs & d) + { + d.showListing(ic); + } + + void gui_CreateListing(Dialogs & d) + { + d.createListing(); + } + void gui_ShowLogFile(Dialogs & d) { d.showLogFile(); Index: src/frontends/guiapi.h =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/guiapi.h,v retrieving revision 1.9 diff -u -p -r1.9 guiapi.h --- src/frontends/guiapi.h 2002/12/01 22:59:18 1.9 +++ src/frontends/guiapi.h 2003/08/27 08:09:13 @@ -23,6 +23,7 @@ class InsetCommand; class InsetError; class InsetERT; class InsetExternal; +class InsetListing; class InsetFloat; class InsetWrap; class InsetGraphics; @@ -52,6 +53,8 @@ extern "C" { void gui_ShowInclude(InsetInclude *, Dialogs &); void gui_ShowIndex(InsetCommand *, Dialogs &); void gui_CreateIndex(Dialogs &); + void gui_ShowListing(InsetCommand *, Dialogs &); + void gui_CreateListing(Dialogs &); void gui_ShowLogFile(Dialogs &); void gui_ShowMathPanel(Dialogs &); void gui_ShowMinipage(InsetMinipage *, Dialogs &); Index: src/frontends/controllers/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/controllers/ChangeLog,v retrieving revision 1.273.2.5 diff -u -p -r1.273.2.5 ChangeLog --- src/frontends/controllers/ChangeLog 2003/06/11 15:39:10 1.273.2.5 +++ src/frontends/controllers/ChangeLog 2003/08/27 08:09:15 @@ -1,3 +1,9 @@ +2003-08-26 Christian Ridderström <[EMAIL PROTECTED]> + (original patch by Herbert Voss <[EMAIL PROTECTED]>) + + * ControlListing.[Ch]: new file + * Makefile.am: new gui for inserting sourcecode into a lyxdoc + 2003-06-06 John Levon <[EMAIL PROTECTED]> * ControlDocument.C: make sure a language change always gets Index: src/frontends/controllers/Makefile.am =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/controllers/Makefile.am,v retrieving revision 1.47 diff -u -p -r1.47 Makefile.am --- src/frontends/controllers/Makefile.am 2002/11/15 02:41:54 1.47 +++ src/frontends/controllers/Makefile.am 2003/08/27 08:09:15 @@ -61,6 +61,8 @@ libcontrollers_la_SOURCES= \ ControlIndex.C \ ControlIndex.h \ ControlInset.h \ + ControlListing.C \ + ControlListing.h \ ControlLog.C \ ControlLog.h \ ControlMath.C \ Index: src/frontends/xforms/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/ChangeLog,v retrieving revision 1.661.2.10 diff -u -p -r1.661.2.10 ChangeLog --- src/frontends/xforms/ChangeLog 2003/07/21 13:06:37 1.661.2.10 +++ src/frontends/xforms/ChangeLog 2003/08/27 08:09:20 @@ -1,3 +1,15 @@ +2003-08-26 Christian Ridderström <[EMAIL PROTECTED]> + (original patch by Herbert Voss <[EMAIL PROTECTED]>) + + * FormListing.[Ch]: new files + * Dialogs.C: + * Dialogs2.C: + * Dialogs_impl.h + * guiapi.C: + * Makefile.am: + * forms/form_listing.fd: + * forms/Makefile.am: new gui for inserting sourcecode into a lyxdoc + 2003-07-11 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> * xfont_loader.C (addFontPath): condition message to Debug::FONT Index: src/frontends/xforms/Dialogs.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/Dialogs.C,v retrieving revision 1.83 diff -u -p -r1.83 Dialogs.C --- src/frontends/xforms/Dialogs.C 2002/12/01 22:59:19 1.83 +++ src/frontends/xforms/Dialogs.C 2003/08/27 08:09:21 @@ -60,6 +60,7 @@ Dialogs::Impl::Impl(LyXView & lv, Dialog graphics(lv, d), include(lv, d), index(lv, d), + listing(lv, d), logfile(lv, d), mathpanel(lv, d), minipage(lv, d), Index: src/frontends/xforms/Dialogs2.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/Dialogs2.C,v retrieving revision 1.11 diff -u -p -r1.11 Dialogs2.C --- src/frontends/xforms/Dialogs2.C 2003/01/31 13:50:21 1.11 +++ src/frontends/xforms/Dialogs2.C 2003/08/27 08:09:21 @@ -133,6 +133,18 @@ void Dialogs::createIndex() } +void Dialogs::showListing(InsetCommand * ic) +{ + pimpl_->listing.controller().showInset(ic); +} + + +void Dialogs::createListing() +{ + pimpl_->listing.controller().createInset(string()); +} + + void Dialogs::showLogFile() { pimpl_->logfile.controller().show(); Index: src/frontends/xforms/Dialogs_impl.h =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/Attic/Dialogs_impl.h,v retrieving revision 1.13 diff -u -p -r1.13 Dialogs_impl.h --- src/frontends/xforms/Dialogs_impl.h 2002/12/01 22:59:19 1.13 +++ src/frontends/xforms/Dialogs_impl.h 2003/08/27 08:09:21 @@ -81,6 +81,10 @@ #include "FormIndex.h" #include "forms/form_index.h" +#include "ControlListing.h" +#include "FormListing.h" +#include "forms/form_listing.h" + #include "ControlLog.h" #include "FormLog.h" @@ -206,6 +210,9 @@ IncludeDialog; typedef GUI<ControlIndex, FormIndex, NoRepeatedApplyReadOnlyPolicy, xformsBC> IndexDialog; +typedef GUI<ControlListing, FormListing, NoRepeatedApplyReadOnlyPolicy, xformsBC> +ListingDialog; + typedef GUI<ControlLog, FormLog, OkCancelPolicy, xformsBC> LogFileDialog; @@ -283,6 +290,7 @@ struct Dialogs::Impl { GraphicsDialog graphics; IncludeDialog include; IndexDialog index; + ListingDialog listing; LogFileDialog logfile; MathPanelDialog mathpanel; MinipageDialog minipage; Index: src/frontends/xforms/Makefile.am =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/Makefile.am,v retrieving revision 1.89 diff -u -p -r1.89 Makefile.am --- src/frontends/xforms/Makefile.am 2002/12/16 11:38:20 1.89 +++ src/frontends/xforms/Makefile.am 2003/08/27 08:09:21 @@ -88,6 +88,8 @@ libxforms_la_SOURCES = \ FormInclude.h \ FormIndex.C \ FormIndex.h \ + FormListing.C \ + FormListing.h \ FormLog.C \ FormLog.h \ FormMathsBitmap.C \ Index: src/frontends/xforms/forms/Makefile.am =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/forms/Makefile.am,v retrieving revision 1.14.2.1 diff -u -p -r1.14.2.1 Makefile.am --- src/frontends/xforms/forms/Makefile.am 2003/05/27 12:45:52 1.14.2.1 +++ src/frontends/xforms/forms/Makefile.am 2003/08/27 08:09:21 @@ -22,6 +22,7 @@ SRCS = form_aboutlyx.fd \ form_forks.fd \ form_graphics.fd \ form_include.fd \ + form_listing.fd \ form_index.fd \ form_maths_delim.fd \ form_maths_matrix.fd \ Index: src/insets/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/src/insets/ChangeLog,v retrieving revision 1.552.2.5 diff -u -p -r1.552.2.5 ChangeLog --- src/insets/ChangeLog 2003/04/01 10:38:44 1.552.2.5 +++ src/insets/ChangeLog 2003/08/27 08:09:26 @@ -1,3 +1,11 @@ +2003-08-26 Christian Ridderström <[EMAIL PROTECTED]> + (original patch by Herbert Voss <[EMAIL PROTECTED]>) + + * Makefile.am: + * inset.h: + * insetlisting.[Ch]: new file + * insettext.C: + 2003-04-01 John Levon <[EMAIL PROTECTED]> * insetgraphicsParams.C (Read): fix reading of subcaptions that Index: src/insets/Makefile.am =================================================================== RCS file: /cvs/lyx/lyx-devel/src/insets/Makefile.am,v retrieving revision 1.50 diff -u -p -r1.50 Makefile.am --- src/insets/Makefile.am 2002/09/24 18:20:26 1.50 +++ src/insets/Makefile.am 2003/08/27 08:09:26 @@ -59,6 +59,8 @@ libinsets_la_SOURCES = \ insetlabel.h \ insetlatexaccent.C \ insetlatexaccent.h \ + insetlisting.C \ + insetlisting.h \ insetmarginal.h \ insetmarginal.C \ insetminipage.C \ Index: src/insets/inset.h =================================================================== RCS file: /cvs/lyx/lyx-devel/src/insets/inset.h,v retrieving revision 1.61 diff -u -p -r1.61 inset.h --- src/insets/inset.h 2002/12/01 22:59:24 1.61 +++ src/insets/inset.h 2003/08/27 08:09:26 @@ -123,7 +123,9 @@ public: /// INDEX_PRINT_CODE, /// - OPTARG_CODE + OPTARG_CODE, + /// + LISTING_CODE }; ///
extra-files-BRANCH_1_3_X.tar.gz
Description: new files