The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 86098d557ece4bf2677bfca06769fd15782f636d Author: Uwe Stöhr <[email protected]> Date: Sat Jan 12 20:32:57 2013 +0100 Additional.lyx: cleanups - avoid that text parts protrude over the page margins - preamble uniformication diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index 8d4cd6d..ec6c40e 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -98,7 +98,7 @@ End \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_amsmath 1 \use_esint 0 @@ -110,6 +110,7 @@ End \paperorientation portrait \suppress_date false \use_refstyle 0 +\notefontcolor #0000ff \index Index \shortcut idx \color #008000 @@ -8826,9 +8827,15 @@ Final Caveat \begin_layout Standard Your mileage may vary. - I've now had papers published by both ApJ and AJ that have had 98% of the - effort done in LyX; the last 2% was the LaTeX post-processing and a few - cleanups. + I've now had papers published by both ApJ and AJ that have had 98 +\begin_inset space \thinspace{} +\end_inset + +% of the effort done in LyX; the last 2 +\begin_inset space \thinspace{} +\end_inset + +% was the LaTeX post-processing and a few cleanups. I have had no trouble with the submission process, and I'm sure the journals were never aware that there might be a difference. So, go forth and publish! @@ -10978,11 +10985,7 @@ LaTeX \begin_inset Quotes eld \end_inset - -\family typewriter % -\family default - \begin_inset Quotes erd \end_inset @@ -19077,7 +19080,11 @@ Edit \end_layout \begin_layout Standard -RCS command that is run: +RCS command that is run: +\begin_inset Newline newline +\end_inset + + \family typewriter ci -q -u -i -t-"<initial description>" <file-name> \end_layout @@ -19178,7 +19185,11 @@ Show History \begin_layout Standard This shows the complete history of the RCS document. - The output of + The output of +\begin_inset Newline newline +\end_inset + + \family typewriter rlog <file-name> \family default @@ -20706,8 +20717,9 @@ C: new project \family default in Windows Explorer, right click it, and select -\family typewriter -TortoiseSVN > Repo-browser +\family sans +TortoiseSVN\SpecialChar \menuseparator +Repo-browser \family default . If necessary, adjust the URL for the repository, then click OK. @@ -20716,9 +20728,8 @@ TortoiseSVN > Repo-browser \begin_layout Enumerate Right click the level of the repository under which you want to place the new project folder (typically the top level) and click -\family typewriter -Create folder\SpecialChar \ldots{} - +\family sans +Create folder \family default Supply a name for the project folder and click OK. Add a message for the log file if desired, then click OK again. @@ -20758,24 +20769,13 @@ new project. \begin_layout Enumerate Create or open your document in LyX and click \family sans -\bar under -F -\bar default -ile\SpecialChar \menuseparator - -\bar under -V -\bar default -ersion +File\SpecialChar \menuseparator +Version \begin_inset space ~ \end_inset Control\SpecialChar \menuseparator - -\bar under -R -\bar default -egister. +Register. \family default Add a log message and click OK to commit the document to version control. @@ -20784,15 +20784,8 @@ Add a log message and click OK to commit the document to version control. \begin_layout Standard From this point onward, you should have full functionality in the \family sans -\bar under -F -\bar default -ile\SpecialChar \menuseparator - -\bar under -V -\bar default -ersion +File\SpecialChar \menuseparator +Version \begin_inset space ~ \end_inset @@ -20992,8 +20985,15 @@ It will usually take a lot of time to get exact command right and it depends \end_deeper \begin_layout Enumerate -Checkout the SVN archive, e.g. - +Checkout the SVN archive, e. +\begin_inset space \thinspace{} +\end_inset + +g. +\begin_inset Newline newline +\end_inset + + \begin_inset Flex Code status collapsed @@ -21846,19 +21846,39 @@ build-script that you can place in a directory on your path: \end_layout -\begin_layout LyX-Code +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard + +\family sans #!/bin/sh \end_layout -\begin_layout LyX-Code +\begin_layout Standard + +\family sans # \end_layout -\begin_layout LyX-Code +\begin_layout Standard + +\family sans notangle -Rbuild-script $1 | env NOWEB_SOURCE=$1 NOWEB_OUTPUT_DIR=$2 sh \end_layout \begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard The next part of the converter setting is the \begin_inset Quotes eld \end_inset @@ -21867,7 +21887,11 @@ Flags \begin_inset Quotes erd \end_inset - which is to be set to + which is to be set to +\begin_inset Newline newline +\end_inset + + \begin_inset Quotes eld \end_inset @@ -22171,7 +22195,11 @@ build-script $$i \begin_inset Quotes erd \end_inset -, with Flags set to +, with Flags set to +\begin_inset Newline newline +\end_inset + + \begin_inset Quotes eld \end_inset @@ -22226,11 +22254,27 @@ Edit Sources to: \end_layout -\begin_layout LyX-Code +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard + +\family sans echo "LYXCMD:monitor:server-goto-file-row:@FILE@ @LINE@" >~/.lyxpipe.in \end_layout \begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard With this, whenever you are using ddd and find a point in the program that you want to edit, you just press shift-ctrl-V (in the ddd window), and ddd will forward this information to LyX through the LyX server and then @@ -22682,6 +22726,13 @@ You can have more than 3 columns if you want to, but that might not be very pleasant for the eye. \end_layout +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + +\end_layout + \begin_layout Subsection Columns inside columns \end_layout diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx index c9d29cc..d29a496 100644 --- a/lib/doc/de/Additional.lyx +++ b/lib/doc/de/Additional.lyx @@ -40,17 +40,6 @@ % Damit der Index den Namen "Stichwortverzeichnis" erhält \addto\captionsngerman{\renewcommand{\indexname}{Stichwortverzeichnis}} - -% Prüfung auf benötigte LaTeXPakete -\usepackage{ifthen} - -% für textumflossenen Bilder/Tabellen -% Prüfung auf picinpar -\newboolean{picinpar} -\IfFileExists{picinpar.sty} - {\usepackage{picinpar} - \setboolean{picinpar}{true}} - {\setboolean{picinpar}{false}} \end_preamble \options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading \use_default_options false @@ -98,7 +87,7 @@ End \spacing single \use_hyperref true \pdf_title "Handbuchergänzungen" -\pdf_author "LyX Team, deutsche Ãbersetzung: Hartmut Haase" +\pdf_author "LyX Team, deutsche Ãbersetzung: Hartmut Haase und Uwe Stöhr" \pdf_subject "LyX-Dokumentation, Benutzerhandbuch, Ergänzungen" \pdf_keywords "LyX, Dokumentation" \pdf_bookmarks true @@ -106,12 +95,12 @@ End \pdf_bookmarksopen false \pdf_bookmarksopenlevel 1 \pdf_breaklinks false -\pdf_pdfborder true +\pdf_pdfborder false \pdf_colorlinks true \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_amsmath 1 \use_esint 0 @@ -123,6 +112,7 @@ End \paperorientation portrait \suppress_date false \use_refstyle 0 +\notefontcolor #0000ff \index Stichwortverzeichnis \shortcut idx \color #008000 @@ -19022,7 +19012,11 @@ prüfen chktex \family default installiert ist. - Sie können es von CTAN beziehen, + Sie können es von CTAN beziehen, +\begin_inset Newline newline +\end_inset + + \begin_inset CommandInset href LatexCommand href target "http://www.ctan.org/tex-archive/help/Catalogue/entries/chktex.html"; @@ -19302,8 +19296,7 @@ Werkzeuge \SpecialChar \menuseparator \family sans -Einstellungen\SpecialChar \ldots{} -\SpecialChar \menuseparator +Einstellungen\SpecialChar \menuseparator Ausgaben\SpecialChar \menuseparator LaTe \begin_inset ERT @@ -19471,7 +19464,11 @@ Geschütztes Leerzeichen \family default - oder + oder +\begin_inset Newline newline +\end_inset + + \family sans Strg+Leertaste \family default diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx index b90740a..93bea5e 100644 --- a/lib/doc/es/Additional.lyx +++ b/lib/doc/es/Additional.lyx @@ -99,7 +99,7 @@ End \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_amsmath 1 \use_esint 0 @@ -111,6 +111,7 @@ End \paperorientation portrait \suppress_date false \use_refstyle 0 +\notefontcolor #0000ff \index Ãndice \shortcut idx \color #008000 @@ -19198,7 +19199,11 @@ LaTeX \family sans ChkTeX \family default - (normalmente se ubica en + (normalmente se ubica en +\begin_inset Newline newline +\end_inset + + \family typewriter /usr/local/share/chktexrc \family default @@ -20734,7 +20739,11 @@ Después se te pide interactivamente una descripción inicial del documento. \end_layout \begin_layout Standard -El comando CVS que es ejecutado: +El comando CVS que es ejecutado: +\begin_inset Newline newline +\end_inset + + \family typewriter cvs -q add -m \begin_inset Quotes erd @@ -21063,7 +21072,11 @@ Mostrar historial \begin_layout Standard Muestra el historial completo del documento CVS. - La salida de + La salida de +\begin_inset Newline newline +\end_inset + + \family typewriter cvs log \begin_inset Quotes eld @@ -21383,7 +21396,11 @@ Mostrar historial \begin_layout Standard Muestra el historial completo del documento SVN. - La salida de + La salida de +\begin_inset Newline newline +\end_inset + + \family typewriter svn log \begin_inset Quotes eld @@ -22329,7 +22346,10 @@ Descarga el archivo SVN, p. \end_inset ej. - +\begin_inset Newline newline +\end_inset + + \begin_inset Flex Code status collapsed @@ -23068,7 +23088,11 @@ He de apuntar que también puedes usar la estructura \begin_layout Standard Para ver un ejemplo de esta construcción y la salida con la referencia cruzada generada, puedes ver la programación literaria en python contenida en el - archivo + archivo +\begin_inset Newline newline +\end_inset + + \family typewriter \emph on LIBDIR @@ -23260,7 +23284,11 @@ La primera parte, que se especifica en el campo \family sans Convertidor \family default -, deberÃa contener +, deberÃa contener +\begin_inset Newline newline +\end_inset + + \begin_inset Quotes fld \end_inset @@ -23310,15 +23338,7 @@ build-script \end_layout \begin_layout LyX-Code -notangle -\begin_inset Formula $ $ -\end_inset - - -\begin_inset Formula $ $ -\end_inset - --Rbuild-script $1 | env NOWEB_SOURCE=$1 sh +notangle -Rbuild-script $1 | env NOWEB_SOURCE=$1 sh \end_layout \begin_layout Standard @@ -23452,11 +23472,7 @@ build-script \begin_inset Newline newline \end_inset -if [ -\begin_inset Formula $ $ -\end_inset - --z "${NOWEB_SOURCE}" ] +if [ -z "${NOWEB_SOURCE}" ] \begin_inset Newline newline \end_inset @@ -23797,20 +23813,9 @@ ddd \family default se puede definir accediendo al diálogo \family sans -\bar under -E -\bar default -ditar\SpecialChar \menuseparator - -\bar under -P -\bar default -referencias\SpecialChar \menuseparator - -\bar under -H -\bar default -elpers +Editar\SpecialChar \menuseparator +Preferencias\SpecialChar \menuseparator +Helpers \family default cambiando la entrada \family sans @@ -23832,11 +23837,27 @@ Edit Sources : \end_layout -\begin_layout LyX-Code +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard + +\family sans echo "LYXCMD:monitor:server-goto-file-row:@FILE@ @LINE@" >~/.lyxpipe.in \end_layout \begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard Con esto, cuando estás usando \family typewriter ddd @@ -23883,7 +23904,11 @@ TuberÃa LyXServer \family default - una ruta como + una ruta como +\begin_inset Newline newline +\end_inset + + \begin_inset Quotes fld \end_inset diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index d62856b..b4bc6d5 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -99,7 +99,7 @@ End \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_amsmath 1 \use_esint 0 @@ -111,6 +111,7 @@ End \paperorientation portrait \suppress_date false \use_refstyle 1 +\notefontcolor #0000ff \index Index \shortcut idx \color #008000 @@ -19052,7 +19053,11 @@ Comment l'utiliser \end_layout \begin_layout Standard -Si le programme est installé, l'employer est un jeu d'enfant : faites +Si le programme est installé, l'employer est un jeu d'enfant : faites +\begin_inset Newline newline +\end_inset + + \family sans Outils\SpecialChar \menuseparator Correction @@ -20522,7 +20527,11 @@ Modifiable \end_layout \begin_layout Standard -En arrière-plan, la commande RCS qui a été lancée est +En arrière-plan, la commande RCS qui a été lancée est +\begin_inset Newline newline +\end_inset + + \family typewriter ci -q -u -i -t-\SpecialChar \- "<description_\SpecialChar \- @@ -22164,7 +22173,11 @@ mixed revision, modified, switched working copy \lang english file revision information. - The result comes from parsing the output of + The result comes from parsing the output of +\begin_inset Newline newline +\end_inset + + \begin_inset Flex Code status collapsed @@ -22481,8 +22494,9 @@ C: new project \family default in Windows Explorer, right click it, and select -\family typewriter -TortoiseSVN > Repo-browser +\family sans +TortoiseSVN\SpecialChar \menuseparator +Repo-browser \family default . If necessary, adjust the URL for the repository, then click OK. @@ -22493,11 +22507,10 @@ TortoiseSVN > Repo-browser \lang english Right click the level of the repository under which you want to place the new project folder (typically the top level) and click -\family typewriter -Create folder\SpecialChar \ldots{} - +\family sans +Create folder \family default - Supply a name for the project folder and click OK. +Supply a name for the project folder and click OK. Add a message for the log file if desired, then click OK again. The new project folder should appear in the repository. Finally, click OK again to exit the repository browser. @@ -22512,8 +22525,7 @@ C: \backslash new project \family default -, this time selecting SVN Checkout\SpecialChar \ldots{} - Select the URL of the project folder +, this time selecting SVN Checkout Select the URL of the project folder you just created in the repository, and set the checkout directory to \family typewriter C: @@ -22775,8 +22787,15 @@ Subversion \end_inset -, section [tunnels], setup ssh command, e.g. - +, section [tunnels], setup ssh command, e. +\begin_inset space \thinspace{} +\end_inset + +g. +\begin_inset Newline newline +\end_inset + + \begin_inset Flex Code status collapsed @@ -22811,8 +22830,15 @@ It will usually take a lot of time to get exact command right and it depends \begin_layout Enumerate \lang english -Checkout the SVN archive, e.g. - +Checkout the SVN archive, e. +\begin_inset space \thinspace{} +\end_inset + +g. +\begin_inset Newline newline +\end_inset + + \begin_inset Flex Code status collapsed @@ -24209,11 +24235,27 @@ ddd sur : \end_layout -\begin_layout LyX-Code +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard + +\family sans echo "LYXCMD:monitor:server-goto-file-row:@FILE@ @LINE@" >~/.lyxpipe.in \end_layout \begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard Ainsi, quand vous utilisez \family typewriter ddd diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index 710e647..35ba227 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -16128,6 +16128,10 @@ TeXæ§æãã§ã㯠chktex \family default ã¯ãCTAN +\begin_inset Newline newline +\end_inset + + \begin_inset CommandInset href LatexCommand href target "http://www.ctan.org/tex-archive/help/Catalogue/entries/chktex.html"; @@ -20067,11 +20071,27 @@ status collapsed ã次ã®ããã«è¨å®ãã¦ãã ããã \end_layout -\begin_layout LyX-Code +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard + +\family sans echo "LYXCMD:monitor:server-goto-file-row:@FILE@ @LINE@" >~/.lyxpipe.in \end_layout \begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Standard ãããã¦ããã¨dddã使ã£ã¦ãã¦ããã°ã©ã ã®ç·¨éãããå ´æããã£ãã¨ããï¼dddã®ã¦ã¤ã³ãã¦ã§ï¼Shift-Ctrl-Vãæ¼ãã ãã§dddã¯LyXãµã¼ãã«æ å ±ã éããLyXã¯åããã¡ã¤ã«ã表示ããã«ã¼ã½ã«ã¯dddã示ããå ´æã¸ããããã¾ããããã§ãããããã°ã®æä¸ã«æ¨æ¸¬ããªããã¹ã¯ãã¼ã«ãã¦å ´æãæ¢ãå¿ è¦ããªããªãã¾ã ã ----------------------------------------------------------------------- Summary of changes: lib/doc/Additional.lyx | 143 ++++++++++++++++++++++++++++++-------------- lib/doc/de/Additional.lyx | 33 +++++------ lib/doc/es/Additional.lyx | 101 ++++++++++++++++++++------------ lib/doc/fr/Additional.lyx | 76 ++++++++++++++++++----- lib/doc/ja/Additional.lyx | 22 +++++++- 5 files changed, 255 insertions(+), 120 deletions(-) hooks/post-receive -- The LyX Source Repository
