anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backport r39509 and r39510 to branch (see bug #7555)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39644 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2011-09-08 10:44:44 +00:00
parent b5c46118ca
commit b88154ef6f
5 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
development/scons/scons_manifest.py
View File

@ -2991,6 +2991,7 @@ lib_scripts_files = Split('''
lyxpreview-lytex2bitmap.py lyxpreview-lytex2bitmap.py
lyxpreview-platex2bitmap.py lyxpreview-platex2bitmap.py
lyxpreview_tools.py lyxpreview_tools.py
lyxstangle.R
lyxsweave.R lyxsweave.R
prefs2prefs.py prefs2prefs.py
prefs2prefs_lfuns.py prefs2prefs_lfuns.py

1
lib/Makefile.am
View File

@ -1486,6 +1486,7 @@ dist_layouts_DATA =\
scriptsdir = $(pkgdatadir)/scripts scriptsdir = $(pkgdatadir)/scripts
dist_scripts_DATA = \ dist_scripts_DATA = \
scripts/bash_completion \ scripts/bash_completion \
scripts/lyxstangle.R \
scripts/lyxsweave.R scripts/lyxsweave.R
# Note that we "chmod 755" manually these files in install-data-hook. # Note that we "chmod 755" manually these files in install-data-hook.
dist_scripts_PYTHON = \ dist_scripts_PYTHON = \

4
lib/configure.py
View File

@ -556,6 +556,7 @@ def checkFormatEntries(dtl_tools):
\Format platex tex "LaTeX (pLaTeX)" "" "" "%%" "document,menu=export" \Format platex tex "LaTeX (pLaTeX)" "" "" "%%" "document,menu=export"
\Format literate nw NoWeb N "" "%%" "document,menu=export" \Format literate nw NoWeb N "" "%%" "document,menu=export"
\Format sweave Rnw "Sweave" S "" "%%" "document,menu=export" \Format sweave Rnw "Sweave" S "" "%%" "document,menu=export"
\Format r R "R/S code" "" "" "%%" "document,menu=export"
\Format lilypond ly "LilyPond music" "" "" "%%" "vector" \Format lilypond ly "LilyPond music" "" "" "%%" "vector"
\Format lilypond-book lytex "LilyPond book (LaTeX)" "" "" "%%" "document,menu=export" \Format lilypond-book lytex "LilyPond book (LaTeX)" "" "" "%%" "document,menu=export"
\Format latex tex "LaTeX (plain)" L "" "%%" "document,menu=export" \Format latex tex "LaTeX (plain)" L "" "%%" "document,menu=export"
@ -681,6 +682,9 @@ def checkConverterEntries():
\converter sweave xetex "%%" "" \converter sweave xetex "%%" ""
\converter sweave luatex "%%" ""''']) \converter sweave luatex "%%" ""'''])
# #
checkProg('a Sweave -> R/S code converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxstangle.R $$i $$e $$r'],
rc_entry = [ r'\converter sweave r "%%" ""' ])
#
checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \ checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \
'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'], 'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'],
rc_entry = [ r'\converter html latex "%%" ""' ]) rc_entry = [ r'\converter html latex "%%" ""' ])

16
lib/scripts/lyxstangle.R Normal file
View File

@ -0,0 +1,16 @@
## file lyxstangle.R
## This file is part of LyX, the document processor.
## Licence details can be found in the file COPYING.
## author Yihui Xie
## Full author contact details are available in file CREDITS
## Rscript $$s/scripts/lyxstangle.R $$i $$e $$r
.cmdargs = commandArgs(TRUE)
options(encoding = .cmdargs[2])
## run Stangle to extract R code
Stangle(.cmdargs[1])

2
status.20x
View File

@ -24,6 +24,8 @@ What's new
* DOCUMENT INPUT/OUTPUT * DOCUMENT INPUT/OUTPUT
- Add possibility to export the R code from a sweave-enabled document
(part of bug 7555).
* USER INTERFACE * USER INTERFACE