anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1.1-staging' into 2.1.x

Browse Source 
Conflicts:
	lib/doc/es/EmbeddedObjects.lyx
	lib/doc/es/UserGuide.lyx
	lib/doc/fr/EmbeddedObjects.lyx
	lib/doc/ja/EmbeddedObjects.lyx
	lib/doc/ja/Intro.lyx
	lib/doc/ja/Math.lyx
	lib/doc/ja/Tutorial.lyx
	lib/doc/ja/UserGuide.lyx
	po/ja.po
	src/mathed/InsetMathNest.cpp
This commit is contained in:
Richard Heck 2014-04-18 11:08:31 -04:00
commit 65a049dfa5
40 changed files with 2579 additions and 1855 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/lyxinclude.m4
View File

@ -463,6 +463,7 @@ AC_ARG_WITH(packaging,
*) lyx_use_packaging=posix;; *) lyx_use_packaging=posix;;
esac]) esac])
AC_MSG_RESULT($lyx_use_packaging) AC_MSG_RESULT($lyx_use_packaging)
lyx_install_posix=false
lyx_install_macosx=false lyx_install_macosx=false
lyx_install_cygwin=false lyx_install_cygwin=false
lyx_install_windows=false lyx_install_windows=false

6
development/cmake/LyxPackaging.cmake
View File

@ -17,12 +17,12 @@ endif()
# (Ignores the top project) # (Ignores the top project)
if(APPLE) if(APPLE)
# true on all systems whre __APPLE__ is defined in header files # true on all systems whre __APPLE__ is defined in header files
set(CPACK_PACKAGE_NAME LyX) set(CPACK_PACKAGE_NAME "LyX${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION}")
elseif(UNIX) elseif(UNIX)
# True also for cygwin # True also for cygwin
set(CPACK_PACKAGE_NAME lyx) set(CPACK_PACKAGE_NAME "lyx${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION}")
else() else()
set(CPACK_PACKAGE_NAME LyX) set(CPACK_PACKAGE_NAME "LyX${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION}")
endif() endif()
set(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}") set(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")

207
lib/doc/es/EmbeddedObjects.lyx
View File

@ -310,7 +310,7 @@ Traducción de: Ignacio García
\family sans \family sans
Versión 2.1.x Versión 2.0.x
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -1910,23 +1910,27 @@ Cuadros ! Configuración
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Un cuadro o tabla se puede cambiar en el menú contextual que aparece con
un clic del botón derecho del ratón.
En la opción
\family sans
Más...
\lang english
You can alter a table by clicking on it with the right mouse button, which
brings up the context menu.
Under the menu entry
\family sans
More
\family default \family default
\lang spanish
se pueden ajustar los parámetros de la celda y fila/columna en la que se se pueden ajustar los parámetros de la celda y fila/columna en la que se
encuentra el cursor. encuentra el cursor.
La entrada del menú contextual
\family sans
Más...\SpecialChar \menuseparator
Configuración...
\lang english
The context menu
\family sans
More\SpecialChar \menuseparator
Settings
\family default \family default
abre una ventana de diálogo donde se pueden ajustar más parámetros del opens the table dialog where you can adjust more things
cuadro. \lang spanish
.
La mayoría de opciones también trabajan sobre una selección de celdas, La mayoría de opciones también trabajan sobre una selección de celdas,
de filas o de columnas. de filas o de columnas.
Observa que hay que diferenciar entre seleccionar una celda o seleccionar Observa que hay que diferenciar entre seleccionar una celda o seleccionar
@ -2414,9 +2418,7 @@ arg "inset-modify tabular move-row-up"
\lang english \lang english
moves the row up
\lang spanish
desplaza la fila arriba
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -2426,7 +2428,9 @@ type "icon"
arg "inset-modify tabular move-column-left" arg "inset-modify tabular move-column-left"
\end_inset \end_inset
desplaza la columna a la izquierda
\lang english
moves the column to the left
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -2436,7 +2440,9 @@ type "icon"
arg "inset-modify tabular move-row-down" arg "inset-modify tabular move-row-down"
\end_inset \end_inset
desplaza la fila abajo
\lang english
moves the row down
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -2446,7 +2452,9 @@ type "icon"
arg "inset-modify tabular move-column-right" arg "inset-modify tabular move-column-right"
\end_inset \end_inset
desplaza la columna a la derecha
\lang english
moves the column to the right
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -7602,17 +7610,20 @@ Cuadros largos ! Leyendas ! distintas para cada página
\begin_layout Standard \begin_layout Standard
Cuando las leyendas para las páginas siguientes hayan de ser diferentes Cuando las leyendas para las páginas siguientes hayan de ser diferentes
de la leyenda de la primera página del cuadro, marca una fila vacía como de la leyenda de la primera página del cuadro,
cabecera que contiene una leyenda. \lang english
Después, clic derecho sobre la leyenda y selecciona mark a empty row as header which contains a caption.
Then right-click on the caption and select in the context menu
\family sans \family sans
Leyenda Caption
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
(CuadroLargoSinNúmero) (LongTableNoNumber
\lang spanish
)
\family default \family default
en el menú contextual. .
El cuadro El cuadro
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -24052,7 +24063,7 @@ Algoritmo
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "cap:Listado-de-código" reference "cap:Listado-de-programa"
\end_inset \end_inset
@ -24115,8 +24126,8 @@ algoritmo
Para insertar el índice de algoritmos puedes usar el menú Para insertar el índice de algoritmos puedes usar el menú
\family sans \family sans
Insertar\SpecialChar \menuseparator Insertar\SpecialChar \menuseparator
Índices\SpecialChar \menuseparator Índice\SpecialChar \menuseparator
Algoritmos Índice de algoritmos
\family default \family default
, si el documento está en el mismo idioma que los menús de LyX. , si el documento está en el mismo idioma que los menús de LyX.
Para documentos en otro idioma usa en su lugar el comando en código TeX: Para documentos en otro idioma usa en su lugar el comando en código TeX:
@ -26950,7 +26961,7 @@ thefigure
\begin_inset VSpace bigskip \begin_inset VSpace bigskip
\end_inset \end_inset
Si estás usando una clase de documento Si estás usando la clase de documento
\series bold \series bold
KOMA-Script KOMA-Script
\series default \series default
@ -27274,16 +27285,16 @@ La norma habitual para colocar las leyendas es:
\end_layout \end_layout
\begin_layout Description \begin_layout Description
Figura: La leyenda al pie de las figuras Figura: La leyenda al pie de la figura
\end_layout \end_layout
\begin_layout Description \begin_layout Description
Cuadro: La leyenda sobre los cuadros Cuadro: La leyenda sobre el cuadro
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Desafortunadamente, las clases estándar de LaTeX no soportan leyendas sobre Desafortunadamente, las clases estándar de LaTeX no soportan leyendas sobre
un cuadro. el cuadro.
Esto implica que si usas las clases de documento Esto implica que si usas las clases de documento
\family sans \family sans
article article
@ -27301,7 +27312,11 @@ letter
report report
\family default \family default
no habrá espacio entre la leyenda y el cuadro. no habrá espacio entre la leyenda y el cuadro.
Para insertar el espacio adecuado, carga el paquete LaTeX Para insertar el espacio adecuado,
\lang english
load
\lang spanish
el paquete LaTeX
\series bold \series bold
caption caption
\series default \series default
@ -27392,7 +27407,7 @@ report (KOMA-Script)
\series bold \series bold
caption caption
\series default \series default
puedes poner puedes poner la opción
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -27402,12 +27417,14 @@ captions=tableheading
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
en las opciones de clase del documento. de la clase de documento.
\begin_inset Foot \begin_inset Foot
status open status open
\begin_layout Plain Layout \begin_layout Plain Layout
Esta opción se usa en este documento.
\lang english
That option is used in this document.
\end_layout \end_layout
\end_inset \end_inset
@ -27416,36 +27433,46 @@ Esta opción se usa en este documento.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
En documentos de clases Koma-Script también puedes hacer clic derecho sobre
una leyenda y marcar en el menú contextual si la quieres encima o debajo \lang english
del cuadro o la figura. In documents with a KOMA-Script document class you can also right-click
De esta forma puedes sobrescribir para ciertas leyendas su colocación predeterm on a caption and mark in the context menu if this should be a caption above
inada por el documento. or below the table/figure.
El cuadro This way you can override the document-wide caption placement for certain
captions.
Table
\lang spanish
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "tab:Una-leyenda-marcada" reference "tab:A-caption-marked"
\end_inset \end_inset
es un ejemplo en el que la leyenda se marca para situar bajo el cuadro
aunque esté encima. \lang english
Se puede comparar con la leyenda sin marcar del cuadro is an example where the caption is marked a being below the table while
it is above.
For comparison the caption in Table
\lang spanish
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "tab:Leyenda-estándar" reference "tab:A-standard-table"
\end_inset \end_inset
.
\lang english
is not marked.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -27460,11 +27487,13 @@ status open
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset CommandInset label \begin_inset CommandInset label
LatexCommand label LatexCommand label
name "tab:Una-leyenda-marcada" name "tab:A-caption-marked"
\end_inset \end_inset
Leyenda marcada para colocar bajo el cuadro.
\lang english
A caption marked as being below the table.
\end_layout \end_layout
\end_inset \end_inset
@ -27603,11 +27632,13 @@ status open
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset CommandInset label \begin_inset CommandInset label
LatexCommand label LatexCommand label
name "tab:Leyenda-estándar" name "tab:A-standard-table"
\end_inset \end_inset
Leyenda de cuadro estándar.
\lang english
A standard table caption.
\end_layout \end_layout
\end_inset \end_inset
@ -29209,7 +29240,7 @@ Igual que en el índice general se listan las secciones del documento, hay
Insertar\SpecialChar \menuseparator Insertar\SpecialChar \menuseparator
Índice Índice
\family default \family default
s. .
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -34228,7 +34259,11 @@ Marco interior
\family sans \family sans
Marco de línea Marco de línea
\family default \family default
y no pongas ancho explícito. y
\lang english
use no explicit
\lang spanish
ancho.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -39243,7 +39278,7 @@ programa Este tipo se describe en el capítulo
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "cap:Listado-de-código" reference "cap:Listado-de-programa"
\end_inset \end_inset
@ -39344,26 +39379,26 @@ Incorporar
\end_layout \end_layout
\begin_layout Chapter \begin_layout Chapter
Listado de código Listado de programa
\begin_inset CommandInset label \begin_inset CommandInset label
LatexCommand label LatexCommand label
name "cap:Listado-de-código" name "cap:Listado-de-programa"
\end_inset \end_inset
\begin_inset Index idx \begin_inset Index idx
status open status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
Listado de código Listado de programa
\end_layout \end_layout
\end_inset \end_inset
\begin_inset Index idx \begin_inset Index idx
status open status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
Código de programa Código de programa
@ -39373,10 +39408,10 @@ Código de programa
\begin_inset Index idx \begin_inset Index idx
status open status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
Flotantes ! Listado de código Flotantes ! Listado de programa
\end_layout \end_layout
\end_inset \end_inset
@ -39397,7 +39432,7 @@ de
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
código. programa.
\family default \family default
El paquete LaTeX El paquete LaTeX
@ -39522,44 +39557,50 @@ h
\family sans \family sans
Flotante Flotante
\family default \family default
en ese caso puesto que los listados de código no flotantes también pueden en ese caso puesto que los listados de programa no flotantes también pueden
tener leyendas y ser referenciadas. tener leyendas y ser referenciadas.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
Se puede añadir una leyenda a un listado de código con el menú Se puede añadir una leyenda a un listado de programa con el menú
\family sans \family sans
Insertar\SpecialChar \menuseparator Insertar\SpecialChar \menuseparator
Leyenda Leyenda
\family default \family default
. .
Los listados de código se pueden referenciar como los flotantes: Listado Los listados de programa se pueden referenciar como los flotantes: Listado
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "lst:Ejemplo-de-listado-de-código" reference "lst:Ejemplo-de-listado-de-programa"
\end_inset \end_inset
Con el menú
\lang english
A list of listings which contains all listings with captions can be created
via the menu
\family sans \family sans
\lang spanish
Insertar\SpecialChar \menuseparator Insertar\SpecialChar \menuseparator
Índices\SpecialChar \menuseparator
Listados \lang english
List
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
de /
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
código TOC\SpecialChar \menuseparator
List of Listings
\family default \family default
se crea un índice de todos los listados de código con leyenda insertados. .
Las entradas del índice son la leyenda y el número de cada listado de código. The list entries are the listing caption and the listing number.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -39575,11 +39616,11 @@ status open
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset CommandInset label \begin_inset CommandInset label
LatexCommand label LatexCommand label
name "lst:Ejemplo-de-listado-de-código" name "lst:Ejemplo-de-listado-de-programa"
\end_inset \end_inset
Ejemplo de listado de código flotante Ejemplo de listado de programa flotante
\end_layout \end_layout
\end_inset \end_inset
@ -39609,7 +39650,7 @@ def func(param):
\begin_layout Standard \begin_layout Standard
Una vez que has escogido un lenguaje de programación en el cuadro de diálogo Una vez que has escogido un lenguaje de programación en el cuadro de diálogo
de listado de código, las palabras clave de ese lenguaje serán reconocidas de listado de programa, las palabras clave de ese lenguaje serán reconocidas
y tipografiadas de manera especial en la salida. y tipografiadas de manera especial en la salida.
En el ejemplo, la clave de Python «def» es reconocida y se imprimirá en En el ejemplo, la clave de Python «def» es reconocida y se imprimirá en
negrita. negrita.
@ -39797,7 +39838,7 @@ listings
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
También es posible imprimir como listado de código líneas de un archivo. También es posible imprimir como listado de programa líneas de un archivo.
Para hacer esto, usa el menú Para hacer esto, usa el menú
\family sans \family sans
Insertar\SpecialChar \menuseparator Insertar\SpecialChar \menuseparator
@ -39810,7 +39851,7 @@ hijo
\family default \family default
y elige el tipo y elige el tipo
\family sans \family sans
Listado de código Listado de programa
\family default \family default
. .
\begin_inset Foot \begin_inset Foot
@ -40005,15 +40046,7 @@ Los parámetros globales para listados de programa se pueden establecer en
\family sans \family sans
Documento\SpecialChar \menuseparator Documento\SpecialChar \menuseparator
Configuración\SpecialChar \menuseparator Configuración\SpecialChar \menuseparator
Listado Listados.
\begin_inset space ~
\end_inset
de
\begin_inset space ~
\end_inset
código.
\family default \family default
Para ver ahí una lista de las opciones disponibles, escribe una interrogación Para ver ahí una lista de las opciones disponibles, escribe una interrogación

1149
lib/doc/es/UserGuide.lyx
View File

File diff suppressed because it is too large Load Diff

1893
lib/doc/fr/EmbeddedObjects.lyx
View File

File diff suppressed because it is too large Load Diff

80
lib/doc/ja/Additional.lyx
View File

@ -13,8 +13,8 @@
% the documentation team % the documentation team
% email: lyx-docs@lists.lyx.org % email: lyx-docs@lists.lyx.org
\IfFileExists{pxjahyper.sty} \ifnum 42146=\euc"A4A2 \AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}\else
{\usepackage{pxjahyper}} \AtBeginDvi{\special{pdf:tounicode 90ms-RKSJ-UCS2}}\fi
% if pdflatex is used % if pdflatex is used
\usepackage{ifpdf} \usepackage{ifpdf}
@ -93,7 +93,7 @@ End
\end_local_layout \end_local_layout
\language japanese \language japanese
\language_package default \language_package default
\inputencoding auto \inputencoding jis-platex
\fontencoding global \fontencoding global
\font_roman default \font_roman default
\font_sans default \font_sans default
@ -113,11 +113,11 @@ End
\paperfontsize 12 \paperfontsize 12
\spacing single \spacing single
\use_hyperref true \use_hyperref true
\pdf_title "LyX's Additional Features manual" \pdf_title "LyX拡張機能篇"
\pdf_author "LyX Team" \pdf_author "LyXプロジェクトチーム"
\pdf_subject "LyX's additional features documentation" \pdf_subject "LyX拡張機能取扱説明書"
\pdf_keywords "LyX, Documentation, Additional" \pdf_keywords "LyX、取扱説明書、文書化、拡張"
\pdf_bookmarks false \pdf_bookmarks true
\pdf_bookmarksnumbered true \pdf_bookmarksnumbered true
\pdf_bookmarksopen false \pdf_bookmarksopen false
\pdf_bookmarksopenlevel 1 \pdf_bookmarksopenlevel 1
@ -126,7 +126,7 @@ End
\pdf_colorlinks true \pdf_colorlinks true
\pdf_backref false \pdf_backref false
\pdf_pdfusetitle false \pdf_pdfusetitle false
\pdf_quoted_options "pdfencoding=pdfdoc, linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
\papersize default \papersize default
\use_geometry false \use_geometry false
\use_package amsmath 1 \use_package amsmath 1
@ -8726,157 +8726,157 @@ aasguide.tex
\backslash \backslash
documentclass documentclass
\family default \family default
(2.1.1)・ (2.1.1)・
\family typewriter \family typewriter
\backslash \backslash
begin{document} begin{document}
\family default \family default
(2.2)・ (2.2)・
\family typewriter \family typewriter
\backslash \backslash
title title
\family default \family default
(2.3)・ (2.3)・
\family typewriter \family typewriter
\backslash \backslash
author author
\family default \family default
(2.3)・ (2.3)・
\family typewriter \family typewriter
\backslash \backslash
affil affil
\family default \family default
(2.3)・ (2.3)・
\family typewriter \family typewriter
\backslash \backslash
abstract abstract
\family default \family default
(2.4)・ (2.4)・
\family typewriter \family typewriter
\backslash \backslash
keywords keywords
\family default \family default
(2.5)・ (2.5)・
\family typewriter \family typewriter
\backslash \backslash
section section
\family default \family default
(2.7)・ (2.7)・
\family typewriter \family typewriter
\backslash \backslash
subsection subsection
\family default \family default
(2.7)・ (2.7)・
\family typewriter \family typewriter
\backslash \backslash
subsubsection subsubsection
\family default \family default
(2.7)・ (2.7)・
\family typewriter \family typewriter
\backslash \backslash
paragraph paragraph
\family default \family default
(2.7)・ (2.7)・
\family typewriter \family typewriter
\backslash \backslash
facility facility
\family default \family default
(2.10)・ (2.10)・
\family typewriter \family typewriter
\backslash \backslash
begin{displaymath} begin{displaymath}
\family default \family default
(2.12)・ (2.12)・
\family typewriter \family typewriter
\backslash \backslash
begin{equation} begin{equation}
\family default \family default
(2.12)・ (2.12)・
\family typewriter \family typewriter
\backslash \backslash
begin{eqnarray} begin{eqnarray}
\family default \family default
(2.12)・ (2.12)・
\family typewriter \family typewriter
\backslash \backslash
begin{mathletters} begin{mathletters}
\family default \family default
(2.12)・ (2.12)・
\family typewriter \family typewriter
\backslash \backslash
begin{thebibliography} begin{thebibliography}
\family default \family default
(2.13.1)・ (2.13.1)・
\family typewriter \family typewriter
\backslash \backslash
bibitem bibitem
\family default \family default
(2.13.2)・全引用コマンドとその派生(2.13.2)・一般的なgraphicx図コマンド(2.14.1)・ (2.13.2)・全引用コマンドとその派生(2.13.2)・一般的なgraphicx図コマンド(2.14.1)・
\family typewriter \family typewriter
\backslash \backslash
begin{table} begin{table}
\family default \family default
(2.15.4)・ (2.15.4)・
\family typewriter \family typewriter
\backslash \backslash
begin{tabular} begin{tabular}
\family default \family default
(2.15.4)・ (2.15.4)・
\family typewriter \family typewriter
\backslash \backslash
caption caption
\family default \family default
(2.15.4)・ (2.15.4)・
\family typewriter \family typewriter
\backslash \backslash
label label
\family default \family default
(他にもあるが特に2.15.4)・ (他にもあるが特に2.15.4)・
\family typewriter \family typewriter
\backslash \backslash
tablerefs tablerefs
\family default \family default
(2.15.5)・ (2.15.5)・
\family typewriter \family typewriter
\backslash \backslash
tablecomments tablecomments
\family default \family default
(2.15.5)・ (2.15.5)・
\family typewriter \family typewriter
\backslash \backslash
url url
\family default \family default
(2.17.4)・ (2.17.4)・
\family typewriter \family typewriter
\backslash \backslash
end{document} end{document}
\family default \family default
(2.18)。 (2.18)。
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -8884,23 +8884,23 @@ end{document}
\family typewriter \family typewriter
longabstract longabstract
\family default \family default
(2.4)・ (2.4)・
\family typewriter \family typewriter
preprint preprint
\family default \family default
(3.2.1)・ (3.2.1)・
\family typewriter \family typewriter
preprint2 preprint2
\family default \family default
(3.2.2)・ (3.2.2)・
\family typewriter \family typewriter
eqsecnum eqsecnum
\family default \family default
(3.3)・ (3.3)・
\family typewriter \family typewriter
flushrt flushrt
\family default \family default
(3.4)。これらは、 (3.4)。これらは、
\begin_inset Flex MenuItem \begin_inset Flex MenuItem
status collapsed status collapsed

163
lib/doc/ja/EmbeddedObjects.lyx
View File

@ -237,7 +237,7 @@ End
\pdf_author "LyX Team, Uwe Stohr" \pdf_author "LyX Team, Uwe Stohr"
\pdf_subject "LyX-documentation about figures, tables, floats, notes, and boxes" \pdf_subject "LyX-documentation about figures, tables, floats, notes, and boxes"
\pdf_keywords "LyX, Tables, Figures, Floats, Boxes, Notes" \pdf_keywords "LyX, Tables, Figures, Floats, Boxes, Notes"
\pdf_bookmarks false \pdf_bookmarks true
\pdf_bookmarksnumbered true \pdf_bookmarksnumbered true
\pdf_bookmarksopen true \pdf_bookmarksopen true
\pdf_bookmarksopenlevel 1 \pdf_bookmarksopenlevel 1
@ -247,8 +247,8 @@ End
\pdf_backref false \pdf_backref false
\pdf_pdfusetitle false \pdf_pdfusetitle false
\pdf_quoted_options " linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false, pdfpagelabels" \pdf_quoted_options " linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false, pdfpagelabels"
\papersize default \papersize a4paper
\use_geometry false \use_geometry true
\use_package amsmath 2 \use_package amsmath 2
\use_package amssymb 2 \use_package amssymb 2
\use_package cancel 0 \use_package cancel 0
@ -1709,66 +1709,31 @@ status collapsed
\begin_layout Standard \begin_layout Standard
\family roman \lang english
\series medium You can alter a table by clicking on it with the right mouse button, which
\shape up brings up the context menu.
\size normal Under the menu entry
\emph off
\bar no
\noun off
\color none
表を右クリックすると、文脈依存メニューが表示されて、表を変更することができます。メニュー項目
\family sans \family sans
\series default More
\shape default
\size default
\emph default
\bar default
\noun default
\color inherit
詳細
\family roman
\series medium
\shape up
\size normal
\emph off
\bar no
\noun off
\color none
以下では、現在カーソルが置かれているセルないし行・列の設定を調節することができます。文脈依存メニュー
\family sans
\series default
\shape default
\size default
\emph default
\bar default
\noun default
\color inherit
詳細\SpecialChar \menuseparator
設定
\family roman
\series medium
\shape up
\size normal
\emph off
\bar no
\noun off
\color none
を選ぶと、ダイアログボックスが開いて、更に詳細な設定を行うことができます。また、ダイアログオプションのほとんどは、選択範囲に対しても動作します。つまり、複数のセ
ルや行・列を選択していれば、操作は選択範囲の全てに対して行われます。
\family default \family default
\series default you can adjust the settings of that cell and row/column respectively where
\shape default the cursor is currently placed.
\size default The context menu
\emph default \family sans
\bar default More\SpecialChar \menuseparator
\noun default Settings
\color inherit \family default
セルの opens the table dialog where you can adjust more things.
Most of the dialog options also work on selections.
This means if you select more cells, columns or rows, the action is done
for the whole selection.
Note that there is a difference between selecting the
\emph on \emph on
内容 contents
\emph default \emph default
を選択するのと、セル自体を選択するのは異なることに注意して下さい。 of the cell, and the cell itself.
\lang japanese
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -2173,7 +2138,9 @@ type "icon"
arg "inset-modify tabular move-row-up" arg "inset-modify tabular move-row-up"
\end_inset \end_inset
は、行を上に移動します。
\lang english
moves the row up
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -2183,7 +2150,9 @@ type "icon"
arg "inset-modify tabular move-column-left" arg "inset-modify tabular move-column-left"
\end_inset \end_inset
は、列を左に移動します。
\lang english
moves the column to the left
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -2193,7 +2162,9 @@ type "icon"
arg "inset-modify tabular move-row-down" arg "inset-modify tabular move-row-down"
\end_inset \end_inset
は、行を下に移動します。
\lang english
moves the row down
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -2203,7 +2174,9 @@ type "icon"
arg "inset-modify tabular move-column-right" arg "inset-modify tabular move-column-right"
\end_inset \end_inset
は、列を右に移動します。
\lang english
moves the column to the right
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -16561,40 +16534,40 @@ definecolor{色彩名}{色彩モデル}{色彩値}
\begin_layout Labeling \begin_layout Labeling
\labelwidthstring 00.00.0000 \labelwidthstring 00.00.0000
cmyk： シアン( cmyk： シアン（
\bar under \bar under
c c
\bar default \bar default
yan)・マゼンタ( yan）・マゼンタ（
\bar under \bar under
m m
\bar default \bar default
agenta)・黄( agenta）・黄（
\bar under \bar under
y y
\bar default \bar default
ellow)・黒(blac ellow）・黒（blac
\bar under \bar under
k k
\bar default \bar default
) ）
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
\labelwidthstring 00.00.0000 \labelwidthstring 00.00.0000
rgb： 赤( rgb： 赤（
\bar under \bar under
r r
\bar default \bar default
ed)・緑( ed）・緑（
\bar under \bar under
g g
\bar default \bar default
reen)・青( reen）・青（
\bar under \bar under
b b
\bar default \bar default
lue) lue）
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling
@ -19795,7 +19768,7 @@ reference "tab:表セル"
の小数点のように、同一列の各セルの内容が、特定の文字で揃えられた方が見栄えの良いことがあります。この揃え方は、当該列にカーソルを置いて、ツールバーボタン の小数点のように、同一列の各セルの内容が、特定の文字で揃えられた方が見栄えの良いことがあります。この揃え方は、当該列にカーソルを置いて、ツールバーボタン
\begin_inset Graphics \begin_inset Graphics
filename ../../images/tabular-feature_align-decimal.png filename ../../trunk/lib/images/tabular-feature_align-decimal.png
scale 85 scale 85
scaleBeforeRotation scaleBeforeRotation
@ -23092,7 +23065,7 @@ reference "sec:キャプションの配置"
節に述べられています。また、LyX文書を読みやすくするために、ボックスラベルを左クリックすれば、フロートボックスを広げたり畳んだりすることができるようになってい 節に述べられています。また、LyX文書を読みやすくするために、ボックスラベルを左クリックすれば、フロートボックスを広げたり畳んだりすることができるようになってい
ます。畳んだフロートボックスは、 ます。畳んだフロートボックスは、
\begin_inset Graphics \begin_inset Graphics
filename clipart/floatQt4.png filename ../../trunk/lib/doc/ja/clipart/floatQt4.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -34757,7 +34730,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -34823,7 +34796,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -34904,7 +34877,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -34970,7 +34943,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -35008,7 +34981,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -35113,7 +35086,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -35175,7 +35148,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -35271,7 +35244,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -35366,7 +35339,7 @@ reference "sec:折返しフロート"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/dialog-show-new-inset_graphics.png filename ../../trunk/lib/images/dialog-show-new-inset_graphics.png
scale 70 scale 70
scaleBeforeRotation scaleBeforeRotation
@ -36202,7 +36175,7 @@ target "http://en.wikipedia.org/wiki/XBoard"
の書式で日付を挿入します。右は、外部素材として挿入された日付です： の書式で日付を挿入します。右は、外部素材として挿入された日付です：
\begin_inset External \begin_inset External
template Date template Date
filename ../../trunk/lib/trunk/lib/doc/ja filename ../../trunk/lib/doc/ja
\end_inset \end_inset
@ -37490,24 +37463,6 @@ status open
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
\series bold
【訳註】
\series default
これは、pLaTeXではうまく動作しません。
\end_layout
\end_inset
\begin_inset Newline newline
\end_inset
以下は、左側の行番号・行間「3」・言語「Python」・「拡張文字コード表を使う」オプション・「空白を記号で表示」オプション・行範囲「3 以下は、左側の行番号・行間「3」・言語「Python」・「拡張文字コード表を使う」オプション・「空白を記号で表示」オプション・行範囲「3
\begin_inset space \thinspace{} \begin_inset space \thinspace{}
\end_inset \end_inset
@ -38615,7 +38570,7 @@ Postscript
\family default \family default
メニューかツールバーボタン メニューかツールバーボタン
\begin_inset Graphics \begin_inset Graphics
filename ../../images/buffer-view_ps.png filename ../../trunk/lib/images/buffer-view_ps.png
scale 85 scale 85
scaleBeforeRotation scaleBeforeRotation
@ -38759,7 +38714,7 @@ dvipdfm
\family default \family default
メニューかツールバーボタン メニューかツールバーボタン
\begin_inset Graphics \begin_inset Graphics
filename ../../images/buffer-view_pdf2.png filename ../../trunk/lib/images/buffer-view_pdf2.png
scale 85 scale 85
scaleBeforeRotation scaleBeforeRotation

8
lib/doc/ja/Intro.lyx
View File

@ -61,8 +61,8 @@ EndPreamble
End End
\end_local_layout \end_local_layout
\language japanese \language japanese
\language_package auto \language_package default
\inputencoding auto \inputencoding utf8-platex
\fontencoding global \fontencoding global
\font_roman default \font_roman default
\font_sans default \font_sans default
@ -86,7 +86,7 @@ End
\pdf_author "LyX Team" \pdf_author "LyX Team"
\pdf_subject "LyX-documentation Intro" \pdf_subject "LyX-documentation Intro"
\pdf_keywords "LyX, documentation" \pdf_keywords "LyX, documentation"
\pdf_bookmarks false \pdf_bookmarks true
\pdf_bookmarksnumbered true \pdf_bookmarksnumbered true
\pdf_bookmarksopen true \pdf_bookmarksopen true
\pdf_bookmarksopenlevel 2 \pdf_bookmarksopenlevel 2
@ -650,7 +650,6 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
\backslash \backslash
texorpdfstring{ texorpdfstring{
\end_layout \end_layout
@ -662,7 +661,6 @@ LyX
status collapsed status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
}{LyX} }{LyX}
\end_layout \end_layout

16
lib/doc/ja/Math.lyx
View File

@ -198,11 +198,11 @@ End
\paperfontsize default \paperfontsize default
\spacing single \spacing single
\use_hyperref true \use_hyperref true
\pdf_title "LyX's Math Manual" \pdf_title "LyX数式説明書"
\pdf_author "LyX Team, Uwe Stohr" \pdf_author "LyXプロジェクトチーム・Uwe Stohr"
\pdf_subject "LyX-documentation about math" \pdf_subject "LyXの数式機能説明書"
\pdf_keywords "LyX, Mathed" \pdf_keywords "LyX, Mathed"
\pdf_bookmarks false \pdf_bookmarks true
\pdf_bookmarksnumbered true \pdf_bookmarksnumbered true
\pdf_bookmarksopen true \pdf_bookmarksopen true
\pdf_bookmarksopenlevel 1 \pdf_bookmarksopenlevel 1
@ -3466,7 +3466,7 @@ arg "math-insert \\space"
\begin_inset Graphics \begin_inset Graphics
filename ../../images/math/phantom.png filename ../../trunk/lib/images/math/phantom.png
scale 85 scale 85
\end_inset \end_inset
@ -3687,7 +3687,7 @@ vphantom
\begin_inset Graphics \begin_inset Graphics
filename ../../images/math/vphantom.png filename ../../trunk/lib/images/math/vphantom.png
scale 85 scale 85
\end_inset \end_inset
@ -3716,7 +3716,7 @@ hphantom
\begin_inset Graphics \begin_inset Graphics
filename ../../images/math/hphantom.png filename ../../trunk/lib/images/math/hphantom.png
scale 85 scale 85
\end_inset \end_inset
@ -33358,7 +33358,7 @@ arg "math-macro newmacroname_newcommand"
\begin_inset Graphics \begin_inset Graphics
filename clipart/macrobox.png filename ../clipart/macrobox.png
scale 50 scale 50
\end_inset \end_inset

13
lib/doc/ja/Tutorial.lyx
View File

@ -13,6 +13,9 @@
% the documentation team % the documentation team
% email: lyx-docs@lists.lyx.org % email: lyx-docs@lists.lyx.org
\ifnum 42146=\euc"A4A2 \AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}\else
\AtBeginDvi{\special{pdf:tounicode 90ms-RKSJ-UCS2}}\fi
\usepackage{ifpdf} % part of the hyperref bundle \usepackage{ifpdf} % part of the hyperref bundle
\ifpdf % if pdflatex is used \ifpdf % if pdflatex is used
@ -61,7 +64,7 @@ EndPreamble
End End
\end_local_layout \end_local_layout
\language japanese \language japanese
\language_package auto \language_package default
\inputencoding auto \inputencoding auto
\fontencoding global \fontencoding global
\font_roman default \font_roman default
@ -74,7 +77,7 @@ End
\font_osf false \font_osf false
\font_sf_scale 100 \font_sf_scale 100
\font_tt_scale 100 \font_tt_scale 100
\graphics default \graphics dvips
\default_output_format pdf \default_output_format pdf
\output_sync 0 \output_sync 0
\bibtex_command default \bibtex_command default
@ -86,7 +89,7 @@ End
\pdf_author "LyX Team, Japanese translation: Koji Yokata" \pdf_author "LyX Team, Japanese translation: Koji Yokata"
\pdf_subject "LyX-documentation Tutorial" \pdf_subject "LyX-documentation Tutorial"
\pdf_keywords "LyX, documentation" \pdf_keywords "LyX, documentation"
\pdf_bookmarks false \pdf_bookmarks true
\pdf_bookmarksnumbered true \pdf_bookmarksnumbered true
\pdf_bookmarksopen true \pdf_bookmarksopen true
\pdf_bookmarksopenlevel 2 \pdf_bookmarksopenlevel 2
@ -148,7 +151,7 @@ LyXプロジェクトチーム
status collapsed status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
なにかコメントや間違いの修正がある場合には、LyX文書化メーリングリスト( なにかコメントや間違いの修正がある場合には、LyX文書化メーリングリスト（
\begin_inset CommandInset href \begin_inset CommandInset href
LatexCommand href LatexCommand href
target "lyx-docs@lists.lyx.org" target "lyx-docs@lists.lyx.org"
@ -156,7 +159,7 @@ type "mailto:"
\end_inset \end_inset
)までお知らせ下さい。この文書の翻訳は、当初人見光太郎氏が行った貢献に基づいています。 ）までお知らせ下さい。この文書の翻訳は、当初人見光太郎氏が行った貢献に基づいています。
\end_layout \end_layout
\end_inset \end_inset

264
lib/doc/ja/UserGuide.lyx
View File

@ -61,6 +61,10 @@
\usepackage{subfig} \usepackage{subfig}
\DeclareCaptionOption{large}[]{\def\captionfont{\large}} \DeclareCaptionOption{large}[]{\def\captionfont{\large}}
\DeclareCaptionOption{Large}[]{\def\captionfont{\Large}} \DeclareCaptionOption{Large}[]{\def\captionfont{\Large}}
%\ifnum 42146=\euc"A4A2 \AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}\else
%\AtBeginDvi{\special{pdf:tounicode 90ms-RKSJ-UCS2}}\fi
%\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}
\end_preamble \end_preamble
\options refpage,intoc,bibliography=totoc,index=totoc,BCOR7.5mm,captions=tableheading \options refpage,intoc,bibliography=totoc,index=totoc,BCOR7.5mm,captions=tableheading
\use_default_options false \use_default_options false
@ -97,8 +101,8 @@ EndPreamble
End End
\end_local_layout \end_local_layout
\language japanese \language japanese
\language_package auto \language_package default
\inputencoding auto \inputencoding utf8-platex
\fontencoding global \fontencoding global
\font_roman default \font_roman default
\font_sans default \font_sans default
@ -122,7 +126,7 @@ End
\pdf_author "LyX Team" \pdf_author "LyX Team"
\pdf_subject "LyX" \pdf_subject "LyX"
\pdf_keywords "LyX" \pdf_keywords "LyX"
\pdf_bookmarks false \pdf_bookmarks true
\pdf_bookmarksnumbered true \pdf_bookmarksnumbered true
\pdf_bookmarksopen false \pdf_bookmarksopen false
\pdf_bookmarksopenlevel 1 \pdf_bookmarksopenlevel 1
@ -151,7 +155,7 @@ End
\use_indices false \use_indices false
\paperorientation portrait \paperorientation portrait
\suppress_date false \suppress_date false
\justification false \justification true
\use_refstyle 0 \use_refstyle 0
\notefontcolor #0000ff \notefontcolor #0000ff
\branch 質問 \branch 質問
@ -1155,12 +1159,12 @@ arg "command-sequence buffer-begin ; buffer-end-select"
\end_layout \end_layout
\begin_layout Section \begin_layout Section
操作を取り消す・繰り返す 元に戻すとやり直す
\begin_inset Index idx \begin_inset Index idx
status collapsed status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
そうさ@操作 ! をとりけす@------を取り消す もとにもどす@元に戻す
\end_layout \end_layout
\end_inset \end_inset
@ -1170,7 +1174,7 @@ status collapsed
status collapsed status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
そうさ @ 操作 ! おなじをくりかえす@同じ------を繰り返す やりなおす@やり直す
\end_layout \end_layout
\end_inset \end_inset
@ -1178,7 +1182,7 @@ status collapsed
\begin_inset CommandInset label \begin_inset CommandInset label
LatexCommand label LatexCommand label
name "sec:操作を取り消す・繰り返す" name "sec:元に戻すとやり直す"
\end_inset \end_inset
@ -1186,10 +1190,11 @@ name "sec:操作を取り消す・繰り返す"
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
LyXでは、何か失敗をしても、簡単に取り消して元に戻すことができます。LyXは大容量の操作取消／繰返バッファを持っています。失敗を元に戻すときには、 LyXでは、何か失敗をしても、簡単にもとに戻すことができます。LyXは大容量のUndo (元に戻す)／Redo (やり直す)バッファを持っています。失敗を元に戻
すときには、
\family sans \family sans
編集\SpecialChar \menuseparator 編集\SpecialChar \menuseparator
操作を取り消す 元に戻す
\family default \family default
かツールバーボタン かツールバーボタン
\begin_inset Info \begin_inset Info
@ -1197,10 +1202,10 @@ type "icon"
arg "undo" arg "undo"
\end_inset \end_inset
を選択して下さい。もし元に戻しすぎた場合には、「操作を取り消すのを取り消す」ために を選択して下さい。もし元に戻しすぎた場合には、「元に戻すのを元に戻す」ために
\family sans \family sans
編集\SpecialChar \menuseparator 編集\SpecialChar \menuseparator
同じ操作を繰り返す やり直す
\family default \family default
あるいはツールバーボタン あるいはツールバーボタン
\begin_inset Info \begin_inset Info
@ -1208,22 +1213,22 @@ type "icon"
arg "redo" arg "redo"
\end_inset \end_inset
を使って下さい。操作取消メカニズムは、メモリーオーバーへッドを押さえるために100ステップに制限されています。 を使って下さい。元に戻すメカニズムは、メモリーオーバーへッドを押さえるために100ステップに制限されています。
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
またファイルを開いてから行ったすべての変更を無効にしても、「変更された」という文章の状態はかわらないことに注意して下さい。これは操作を取り消すのを上記のように1 またファイルを開いてから行ったすべての変更を無効にしても、「変更された」という文章の状態はかわらないことに注意して下さい。これは元に戻すのを上記のように100ス
00ステップに制限したためです。 テップに制限したためです。
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\family sans \family sans
操作を取り消す 元に戻す
\family default \family default
と と
\family sans \family sans
同じ操作を繰り返す やり直す
\family default \family default
は、LyXの中のほとんどすべてのものについて働きます。しかしながら、入力された文章については、文字単位ではなくて文字の塊ごとに元に戻したりやり直したりすることが は、LyXの中のほとんどすべてのものについて働きます。しかしながら、入力された文章については、文字単位ではなくて文字の塊ごとに元に戻したりやり直したりすることが
できます。 できます。
@ -1474,13 +1479,13 @@ reference "sec:書誌情報"
\begin_layout Standard \begin_layout Standard
\begin_inset Graphics \begin_inset Graphics
filename ../../images/reload.png filename ../../trunk/lib/images/reload.png
\end_inset \end_inset
ボタンは、(通常必要でないはずですが)目次を再描画します。その隣のボタンは、節の文書中の位置を変えるためのボタンです。 ボタンは、(通常必要でないはずですが)目次を再描画します。その隣のボタンは、節の文書中の位置を変えるためのボタンです。
\begin_inset Graphics \begin_inset Graphics
filename ../../images/down.png filename ../../trunk/lib/images/down.png
scale 85 scale 85
groupId toolbarbuttons groupId toolbarbuttons
@ -1488,7 +1493,7 @@ reference "sec:書誌情報"
および および
\begin_inset Graphics \begin_inset Graphics
filename ../../images/up.png filename ../../trunk/lib/images/up.png
scale 85 scale 85
groupId toolbarbuttons groupId toolbarbuttons
@ -1497,7 +1502,7 @@ reference "sec:書誌情報"
を使うと、節の文書中の位置が、前方に移動したり後方に移動したりします。つまり、例えば第2.5節を、第2.4節の前に持っていったり第2.6節の後に移動したりすることがで を使うと、節の文書中の位置が、前方に移動したり後方に移動したりします。つまり、例えば第2.5節を、第2.4節の前に持っていったり第2.6節の後に移動したりすることがで
きるわけです。それに伴い、LyXは、節番号を自動的に新しい順序に振り直してくれます。 きるわけです。それに伴い、LyXは、節番号を自動的に新しい順序に振り直してくれます。
\begin_inset Graphics \begin_inset Graphics
filename ../../images/promote.png filename ../../trunk/lib/images/promote.png
scale 85 scale 85
groupId toolbarbuttons groupId toolbarbuttons
@ -1505,7 +1510,7 @@ reference "sec:書誌情報"
ないし ないし
\begin_inset Graphics \begin_inset Graphics
filename ../../images/demote.png filename ../../trunk/lib/images/demote.png
scale 85 scale 85
groupId toolbarbuttons groupId toolbarbuttons
@ -1623,8 +1628,12 @@ LyXは、現在開かれている全ての文書を走査して、単語の補
\family sans \family sans
カーソル表示器 カーソル表示器
\family default \family default
オプションを無効にすれば、表示されなくなります。一般オプションでは、補完入力やポップアップ補完の遅延時間を設定したり、単語の補完を開始するまでに最低限なくてはな オプションを無効にすれば、表示されなくなります。
らない文字数を指定したり、長い補完の切り詰めを行うかどうかを選択することができます。 \lang english
With the general options you can define the delay time for the inline and
popup completion, you can set the minimal number of characters a word must
have that it will be taken into account for a completion and you can choose
if long completions should be abbreviated.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -4318,7 +4327,7 @@ status collapsed
status collapsed status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
せつみだし@節見出し!のたんしゅくけい@------の短縮形 せつみだし@節見出し!のたんしゅく形@------の短縮形
\end_layout \end_layout
\end_inset \end_inset
@ -6356,7 +6365,7 @@ arg "newline-insert newline"
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
ほとんどの学術論文は、概要に始まり書誌情報で終わります。LyXには、この2つのための段落環境もあります。 ほとんどの学術論文は、概要に始まり参考文献で終わります。LyXには、この2つのための段落環境もあります。
\end_layout \end_layout
\begin_layout Subsubsection \begin_layout Subsubsection
@ -6920,12 +6929,14 @@ Verbatim
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
これは無調整(verbatim)環境です。 これは無調整(verbatim)環境です。
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
\noindent \noindent
\align block \align block
この下の2行は空白行です。 この下の2行は空白行です。
\end_layout \end_layout
@ -6938,6 +6949,7 @@ Verbatim
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
右記の各文字を始め、ほぼすべての文字が使えます。例："%&$§#~'` 右記の各文字を始め、ほぼすべての文字が使えます。例："%&$§#~'`
\backslash \backslash
}][{| }][{|
@ -13457,7 +13469,7 @@ reference "sec:出力"
\family default \family default
かツールバーボタン かツールバーボタン
\begin_inset Graphics \begin_inset Graphics
filename ../../images/view-others.png filename ../../trunk/lib/images/view-others.png
scale 85 scale 85
groupId toolbarbuttons groupId toolbarbuttons
@ -15130,7 +15142,7 @@ status collapsed
\begin_layout Standard \begin_layout Standard
注釈は、ツールバーボタン 注釈は、ツールバーボタン
\begin_inset Graphics \begin_inset Graphics
filename ../../images/note-insert.png filename ../../trunk/lib/images/note-insert.png
scale 85 scale 85
scaleBeforeRotation scaleBeforeRotation
@ -16076,8 +16088,11 @@ reference "sub:表のセル"
\emph on \emph on
表 表
\emph default \emph default
」の節に説明されているように、連結行セルのように表に特別な整形を行うときに必要になるでしょう。また、カーソル位置のセルや表全体も回転させることができます。この回 」の節に説明されているように、連結行セルのように表に特別な整形を行うときに必要になるでしょう。
転はLyX上には表示されませんが、出力では正しく表示されます。 \lang english
You can also rotate the current cell or the whole table
\lang japanese
。この回転はLyX上には表示されませんが、出力では正しく表示されます。
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -23752,7 +23767,7 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
\series bold \series bold
【訳註】 訳註：
\series default \series default
文書言語が「日本語」になっているときは、アクセント付き文字を、アクセントを直接入力できる欧州言語用のキーボードなどで直接入力して使用することはできません。その代 文書言語が「日本語」になっているときは、アクセント付き文字を、アクセントを直接入力できる欧州言語用のキーボードなどで直接入力して使用することはできません。その代
わりに、この小節で行っているように、LaTeXコマンドを使用してアクセントを入力してやる必要があります。しかし、ここで書かれていることは、漢字コード順と索引順が わりに、この小節で行っているように、LaTeXコマンドを使用してアクセントを入力してやる必要があります。しかし、ここで書かれていることは、漢字コード順と索引順が
@ -27576,10 +27591,6 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
正規表現のよい説明がWikipediaの以下の項目にあります。 正規表現のよい説明がWikipediaの以下の項目にあります。
\begin_inset Newline newline
\end_inset
\begin_inset CommandInset href \begin_inset CommandInset href
LatexCommand href LatexCommand href
target "http://en.wikipedia.org/wiki/Regular_expression" target "http://en.wikipedia.org/wiki/Regular_expression"
@ -28107,7 +28118,7 @@ Linuxでは、頒布版や辞書の導入の仕方によって、典型的な場
\backslash \backslash
Program Files Program Files
\backslash \backslash
LibreOffice-<バージョン> LibreOffice-<Version>
\backslash \backslash
share share
\backslash \backslash
@ -28979,7 +28990,7 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
\series bold \series bold
【訳註】 (訳註)
\series default \series default
よくわからない人は『Star Trek』を参照のこと。 よくわからない人は『Star Trek』を参照のこと。
\end_layout \end_layout
@ -29967,14 +29978,14 @@ status collapsed
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
操作を取り消す・同じ操作を繰り返す 元に戻すとやり直す
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
第 第
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
reference "sec:操作を取り消す・繰り返す" reference "sec:元に戻すとやり直す"
\end_inset \end_inset
@ -32340,7 +32351,7 @@ arg "undo"
\family sans \family sans
編集\SpecialChar \menuseparator 編集\SpecialChar \menuseparator
操作を取り消す 元に戻す
\end_layout \end_layout
\end_inset \end_inset
@ -32370,7 +32381,7 @@ arg "redo"
\family sans \family sans
編集\SpecialChar \menuseparator 編集\SpecialChar \menuseparator
同じ操作を繰り返す やり直す
\end_layout \end_layout
\end_inset \end_inset
@ -33866,7 +33877,7 @@ arg "buffer-toggle-output-sync"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/view-others.png filename ../../trunk/lib/images/view-others.png
scale 85 scale 85
groupId toolbarbuttons groupId toolbarbuttons
@ -33896,7 +33907,7 @@ arg "buffer-toggle-output-sync"
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Graphics \begin_inset Graphics
filename ../../images/update-others.png filename ../../trunk/lib/images/update-others.png
scale 85 scale 85
groupId toolbarbuttons groupId toolbarbuttons
@ -34256,7 +34267,14 @@ LyXは、二段組や行間を画面には反映しないことに注意して
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
LyX作業域で整形を行うオプションを使うと、LyX画面上で文を整形するかどうか指定することができます。これは、LyX内部の文にのみ影響し，出力には影響しません。
\lang english
With the option
\family sans
Use justification in LyX work area
\family default
you can decide if LyX justifies the text on screen.
This only affects the text inside LyX not in the output.
\end_layout \end_layout
\begin_layout Section \begin_layout Section
@ -35382,20 +35400,29 @@ amsmath これは、多くの数式要素に必要とされているので、数
\end_layout \end_layout
\begin_layout Description \begin_layout Description
amssymb これは、ボールド体ギリシャ文字やアップライト体ギリシャ文字など、特殊な数学記号に必要です。数式でLaTeXエラーが出る場合には、これが有効になっ
ているか確認してください。 \lang english
amssymb is needed for some special math symbols like bold or upright Greek
letters, so when you get LaTeX-errors in formulas, ensure that you have
this enabled.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
cancel これは、数式の取り消しに使われます。取扱説明書『
\lang english
cancel is used for canceled formulas, see section
\emph on \emph on
数式篇 Canceled
\begin_inset space ~
\end_inset
Formulas
\emph default \emph default
』の「 of the
\emph on \emph on
数式の消去 Math
\emph default \emph default
」の節をご覧ください。 manual.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -35423,47 +35450,49 @@ mathdots これは、特殊な省略符号に用いられます。取扱説明
\end_layout \end_layout
\begin_layout Description \begin_layout Description
mathtools これは、
\lang english
mathtools is used for the math commands
\series bold \series bold
\backslash \backslash
overbracket overbracket
\series default \series default
・ ,
\series bold \series bold
\backslash \backslash
underbracket underbracket
\series default \series default
・ ,
\series bold \series bold
\backslash \backslash
smashoperator smashoperator
\series default \series default
・ ,
\series bold \series bold
\backslash \backslash
adjustlimits adjustlimits
\series default \series default
・ ,
\series bold \series bold
\backslash \backslash
splitfrac splitfrac
\series default \series default
・ ,
\series bold \series bold
\backslash \backslash
shortintertext shortintertext
\series default \series default
の各数式コマンドとラベル付き矢印に使われます。取扱説明書『 and labeled arrows, see the corresponding sections in the
\emph on \emph on
数式篇 Math
\emph default \emph default
』の対応する節をご覧ください。 manual.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -35479,39 +35508,49 @@ mhchem これは、化学式に用いられます。取扱説明書『
\end_layout \end_layout
\begin_layout Description \begin_layout Description
stackrel これは、数式コマンド
\lang english
stackrel is used for the math command
\series bold \series bold
\backslash \backslash
stackrel stackrel
\series default \series default
のために用いられます。取扱説明書『 , see section
\emph on \emph on
数式篇 Relations
\emph default \emph default
』の「 of the
\emph on \emph on
関係子 Math
\emph default \emph default
」の節をご覧ください。 manual.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
stmaryrd これは、特殊な数式記号のために用いられます。
\lang english
stmaryrd is used for a few special math symbols.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
undertilde これは、数式コマンド
\lang english
undertilde is used for the math command
\series bold \series bold
\backslash \backslash
utilde utilde
\series default \series default
のために用いられます。取扱説明書『 , see section
\emph on \emph on
数式篇 Accents for one Character
\emph default \emph default
』の「アクセント」の節をご覧ください。 of the
\emph on
Math
\emph default
manual.
\end_layout \end_layout
\begin_layout Section \begin_layout Section
@ -36044,7 +36083,9 @@ target "http://wiki.lyx.org/uploads/LyX/NewInLyX20/themes.png"
\end_layout \end_layout
\begin_layout Subsubsection \begin_layout Subsubsection
文脈依存ヘルプ
\lang english
Context help
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -36056,24 +36097,34 @@ target "http://wiki.lyx.org/uploads/LyX/NewInLyX20/themes.png"
\end_layout \end_layout
\begin_layout Subsubsection \begin_layout Subsubsection
メニュー
\lang english
Menus
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\family sans \family sans
直近のファイルの数 \lang english
Maximum last files
\family default \family default
は、メニュー is the number of last opened files that LyX should display in the menu
\family sans \family sans
ファイル\SpecialChar \menuseparator File\SpecialChar \menuseparator
直近のファイルを開く Open
\begin_inset space ~
\end_inset
Recent
\family default \family default
に表示される直近に開かれたファイルの数です。 .
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
文書処理
\lang english
Document Handling
\end_layout \end_layout
\begin_layout Subsubsection \begin_layout Subsubsection
@ -36113,7 +36164,11 @@ target "http://wiki.lyx.org/uploads/LyX/NewInLyX20/themes.png"
\end_layout \end_layout
\begin_layout Subsubsection \begin_layout Subsubsection
バックアップと保存
\lang english
Backup & saving
\lang japanese
\begin_inset CommandInset label \begin_inset CommandInset label
LatexCommand label LatexCommand label
name "sub:文書のバックアップ" name "sub:文書のバックアップ"
@ -36178,7 +36233,9 @@ reference "sec:パス"
\end_layout \end_layout
\begin_layout Subsubsection \begin_layout Subsubsection
ウィンドウと作業領域
\lang english
Windows & work area
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -36253,16 +36310,21 @@ status open
\begin_layout Standard \begin_layout Standard
\lang english
With the setting
\family sans \family sans
最後の表示窓を閉じる際 Closing last view
\family default \family default
の設定では、文書のタブもしくは表示窓を閉じるとき、文書を閉じるのか非表示にするのかを指定することができます。非表示になっている文書は、 you one can decide if a document is closed or hidden when its tab or view
is closed.
Hidden documents are accessible via the menu
\family sans \family sans
表示\SpecialChar \menuseparator View\SpecialChar \menuseparator
非表示分 Hidden
\family default \family default
メニューで見ることができます。ファイルをいくつかのLyXインスタンスで並行して開いていて、1つのインスタンスでのみ表示窓を閉じたい時には、文書を閉じないようにす .
る選択は便利です。 Not to close documents can be useful if you open files parallel in several
instances of LyX and only want to close the view in once instance.
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
@ -37494,7 +37556,17 @@ selectlanguage{$$lang}
\end_layout \end_layout
\begin_layout Description \begin_layout Description
長さ単位の既定値 LyXのダイアログ内で用いる、長さの単位の既定値を指定します。
\lang english
Default
\begin_inset space ~
\end_inset
length
\begin_inset space ~
\end_inset
unit Defines the unit that is used as default for lengths in LyX's dialogs.
\end_layout \end_layout
\begin_layout Description \begin_layout Description
@ -39014,7 +39086,7 @@ target "http://mirrors.ctan.org/biblio/bibtex/contrib/doc/btxdoc.pdf"
\end_inset \end_inset
:
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -39051,10 +39123,6 @@ target "http://www.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf"
\end_inset \end_inset
:
\begin_inset Newline newline
\end_inset
\begin_inset Flex URL \begin_inset Flex URL
status collapsed status collapsed
@ -39158,7 +39226,7 @@ target "http://www.ams.org/publications/authors/tex/amslatex"
\end_inset \end_inset
:
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -39432,7 +39500,7 @@ latexはつけじ@LaTeXパッケージ ! prettyref
\end_inset \end_inset
の :の
\begin_inset CommandInset href \begin_inset CommandInset href
LatexCommand href LatexCommand href
name "取扱説明書" name "取扱説明書"
@ -39440,7 +39508,7 @@ target "http://www.ctan.org/tex-archive/macros/latex/contrib/prettyref/prettyref
\end_inset \end_inset
:
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -39479,7 +39547,7 @@ latexはつけじ@LaTeXパッケージ ! refstyle
\end_inset \end_inset
の :の
\begin_inset CommandInset href \begin_inset CommandInset href
LatexCommand href LatexCommand href
name "取扱説明書" name "取扱説明書"
@ -39487,7 +39555,7 @@ target "http://mirrors.ctan.org/macros/latex/contrib/refstyle/refstyle.pdf"
\end_inset \end_inset
:
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset

2
lib/layouts/algorithm2e.module
View File

@ -1,7 +1,7 @@
#\DeclareLyXModule[algorithm2e.sty]{Algorithm2e} #\DeclareLyXModule[algorithm2e.sty]{Algorithm2e}
#DescriptionBegin #DescriptionBegin
# Use the algorithm2e package for algorithm floats rather # Use the algorithm2e package for algorithm floats rather
# then LyX's home-brewn algorithm floats. # than LyX's home-brewed algorithm floats.
#DescriptionEnd #DescriptionEnd
# #
#Author: Jürgen Spitzmüller #Author: Jürgen Spitzmüller

2
lib/scripts/legacy_lyxpreview2ppm.py
View File

@ -293,6 +293,8 @@ def legacy_conversion_step1(latex_file, dpi, output_format, fg_color, bg_color,
# Compile the latex file. # Compile the latex file.
latex_status, latex_stdout = run_latex(latex, latex_file) latex_status, latex_stdout = run_latex(latex, latex_file)
if latex_status:
return (latex_status, [])
if pdf_output: if pdf_output:
return legacy_conversion_step3(latex_file, dpi, output_format, True, skipMetrics) return legacy_conversion_step3(latex_file, dpi, output_format, True, skipMetrics)

2
lib/scripts/lyxpak.py
View File

@ -145,6 +145,8 @@ def gather_files(curfile, incfiles, lyx2lyx):
match = re_options.match(lines[i]) match = re_options.match(lines[i])
if match: if match:
file = match.group(3).strip('"') file = match.group(3).strip('"')
if file.startswith("bibtotoc,"):
file = file[9:]
if not os.path.isabs(file): if not os.path.isabs(file):
file = os.path.join(curdir, file + '.bst') file = os.path.join(curdir, file + '.bst')
if os.path.exists(file): if os.path.exists(file):

2
lib/scripts/lyxpreview2bitmap.py
View File

@ -409,6 +409,8 @@ def main(argv):
# Compile the latex file. # Compile the latex file.
latex_status, latex_stdout = run_latex(latex, latex_file, bibtex) latex_status, latex_stdout = run_latex(latex, latex_file, bibtex)
if latex_status:
return (latex_status, [])
# The dvi output file name # The dvi output file name
dvi_file = latex_file_re.sub(".dvi", latex_file) dvi_file = latex_file_re.sub(".dvi", latex_file)

4
lib/ui/stdmenus.inc
View File

@ -217,11 +217,15 @@ Menuset
Item "Add Row|A" "inset-modify tabular append-row" Item "Add Row|A" "inset-modify tabular append-row"
Item "Delete Row|D" "inset-modify tabular delete-row" Item "Delete Row|D" "inset-modify tabular delete-row"
Item "Copy Row|o" "inset-modify tabular copy-row" Item "Copy Row|o" "inset-modify tabular copy-row"
Item "Move Row Up" "inset-modify tabular move-row-up"
Item "Move Row Down" "inset-modify tabular move-row-down"
# Item "Swap Rows|S" "inset-modify tabular swap-row" # currently broken # Item "Swap Rows|S" "inset-modify tabular swap-row" # currently broken
Separator Separator
Item "Add Column|u" "inset-modify tabular append-column" Item "Add Column|u" "inset-modify tabular append-column"
Item "Delete Column|e" "inset-modify tabular delete-column" Item "Delete Column|e" "inset-modify tabular delete-column"
Item "Copy Column|p" "inset-modify tabular copy-column" Item "Copy Column|p" "inset-modify tabular copy-column"
Item "Move Column Right|v" "inset-modify tabular move-column-right"
Item "Move Column Left" "inset-modify tabular move-column-left"
# Item "Swap Columns|w" "inset-modify tabular swap-column" # currently broken # Item "Swap Columns|w" "inset-modify tabular swap-column" # currently broken
End End

78
po/ja.po
View File

@ -923,8 +923,7 @@ msgstr "検索フィールド(&H):"
#: src/frontends/qt4/ui/CitationUi.ui:382 #: src/frontends/qt4/ui/CitationUi.ui:382
msgid "" msgid ""
"Enter the text to search for and press Enter or click the button to search" "Enter the text to search for and press Enter or click the button to search"
msgstr "" msgstr "検索する語句を入力してEnterを押すか、ボタンをクリックして検索してください"
"検索する語句を入力してEnterを押すか、ボタンをクリックして検索してください"
#: src/frontends/qt4/ui/CitationUi.ui:395 #: src/frontends/qt4/ui/CitationUi.ui:395
msgid "Click or press Enter in the search box to search" msgid "Click or press Enter in the search box to search"
@ -1445,8 +1444,7 @@ msgstr "様式を無視(&G)"
msgid "" msgid ""
"Keep the case of the replacement's first letter as in each matching text " "Keep the case of the replacement's first letter as in each matching text "
"first letter" "first letter"
msgstr "" msgstr "置換後の語句の最初の文字の大小を、置換前の語句の最初の文字の大小に合わせる。"
"置換後の語句の最初の文字の大小を、置換前の語句の最初の文字の大小に合わせる。"
#: src/frontends/qt4/ui/FindAndReplaceUi.ui:297 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:297
msgid "&Preserve first case on replace" msgid "&Preserve first case on replace"
@ -3031,8 +3029,7 @@ msgstr "一般"
msgid "" msgid ""
"After the cursor has not moved for this time, the inline completion is shown " "After the cursor has not moved for this time, the inline completion is shown "
"if it is available." "if it is available."
msgstr "" msgstr "これだけの時間カーソルを動かさなかったとき、可能ならば補完入力を表示します。"
"これだけの時間カーソルを動かさなかったとき、可能ならば補完入力を表示します。"
#: src/frontends/qt4/ui/PrefCompletionUi.ui:154 #: src/frontends/qt4/ui/PrefCompletionUi.ui:154
msgid "s inline completion dela&y" msgid "s inline completion dela&y"
@ -3062,8 +3059,7 @@ msgstr "補完を開始する最小文字数"
msgid "" msgid ""
"When the TAB completion is not unique, there won't be a delay of the popup. " "When the TAB completion is not unique, there won't be a delay of the popup. "
"It will be shown right away." "It will be shown right away."
msgstr "" msgstr "タブ補完に複数候補がある場合、ポップアップに遅延を置かず、直ちに表示する。"
"タブ補完に複数候補がある場合、ポップアップに遅延を置かず、直ちに表示する。"
#: src/frontends/qt4/ui/PrefCompletionUi.ui:277 #: src/frontends/qt4/ui/PrefCompletionUi.ui:277
msgid "Sho&w popup without delay for non-unique completions" msgid "Sho&w popup without delay for non-unique completions"
@ -3343,8 +3339,7 @@ msgstr "文書形式(&D)"
#: src/frontends/qt4/ui/PrefFileformatsUi.ui:80 #: src/frontends/qt4/ui/PrefFileformatsUi.ui:80
msgid "Check this to show the current format in the File > Export menu" msgid "Check this to show the current format in the File > Export menu"
msgstr "" msgstr "この形式をファイル→書き出しメニューに表示させたいときには有効にしてください"
"この形式をファイル→書き出しメニューに表示させたいときには有効にしてください"
#: src/frontends/qt4/ui/PrefFileformatsUi.ui:83 #: src/frontends/qt4/ui/PrefFileformatsUi.ui:83
msgid "Sho&w in export menu" msgid "Sho&w in export menu"
@ -4175,8 +4170,7 @@ msgstr "ユーザー設定幅(&W):"
#: src/frontends/qt4/ui/PrintNomenclUi.ui:52 #: src/frontends/qt4/ui/PrintNomenclUi.ui:52
msgid "Custom value. \"List Indentation\" needs to be set to \"Custom\"." msgid "Custom value. \"List Indentation\" needs to be set to \"Custom\"."
msgstr "" msgstr "任意設定の値。「リストの行頭下げ」を「任意設定」に設定する必要があります。"
"任意設定の値。「リストの行頭下げ」を「任意設定」に設定する必要があります。"
#: src/frontends/qt4/ui/PrintUi.ui:28 #: src/frontends/qt4/ui/PrintUi.ui:28
msgid "Pages" msgid "Pages"
@ -4959,8 +4953,7 @@ msgstr "二段組文書(&C)"
msgid "" msgid ""
"Justify text in the LyX editor (this does not affect whether the text is " "Justify text in the LyX editor (this does not affect whether the text is "
"justified in the output)" "justified in the output)"
msgstr "" msgstr "LyXエディタ中で整形を行う(出力中で文書が整形されるかどうかには影響しません)"
"LyXエディタ中で整形を行う(出力中で文書が整形されるかどうかには影響しません)"
#: src/frontends/qt4/ui/TextLayoutUi.ui:284 #: src/frontends/qt4/ui/TextLayoutUi.ui:284
msgid "Use &justification in LyX work area" msgid "Use &justification in LyX work area"
@ -5001,8 +4994,7 @@ msgstr "見出しを選択語で置換"
#: src/frontends/qt4/ui/ThesaurusUi.ui:102 #: src/frontends/qt4/ui/ThesaurusUi.ui:102
msgid "Click to select a proposal, double click to look it up." msgid "Click to select a proposal, double click to look it up."
msgstr "" msgstr "クリックすれば候補が選択されます。ダブルクリックするとその意味を引きます。"
"クリックすれば候補が選択されます。ダブルクリックするとその意味を引きます。"
#: src/frontends/qt4/ui/TocUi.ui:36 #: src/frontends/qt4/ui/TocUi.ui:36
msgid "Filter:" msgid "Filter:"
@ -5066,8 +5058,7 @@ msgstr "LyX: 入力して下さい"
#: src/frontends/qt4/ui/ToggleWarningUi.ui:44 #: src/frontends/qt4/ui/ToggleWarningUi.ui:44
msgid "If you check this, LyX will not warn you again in the given case." msgid "If you check this, LyX will not warn you again in the given case."
msgstr "" msgstr "これを有効にすると、LyXは当該ケースについて今後警告することはなくなります。"
"これを有効にすると、LyXは当該ケースについて今後警告することはなくなります。"
#: src/frontends/qt4/ui/ToggleWarningUi.ui:47 #: src/frontends/qt4/ui/ToggleWarningUi.ui:47
msgid "&Do not show this warning again!" msgid "&Do not show this warning again!"
@ -21837,16 +21828,14 @@ msgstr "変換スクリプトが失敗しました"
msgid "" msgid ""
"%1$s is from an older version of LyX and the lyx2lyx script failed to " "%1$s is from an older version of LyX and the lyx2lyx script failed to "
"convert it." "convert it."
msgstr "" msgstr "%1$s は旧版のLyXで作成されており，スクリプトlyx2lyxは変換に失敗 しました。"
"%1$s は旧版のLyXで作成されており，スクリプトlyx2lyxは変換に失敗 しました。"
#: src/Buffer.cpp:1237 #: src/Buffer.cpp:1237
#, c-format #, c-format
msgid "" msgid ""
"%1$s is from a newer version of LyX and the lyx2lyx script failed to convert " "%1$s is from a newer version of LyX and the lyx2lyx script failed to convert "
"it." "it."
msgstr "" msgstr "%1$s は新版のLyXファイルなので，スクリプトlyx2lyxが変換に失敗しました。"
"%1$s は新版のLyXファイルなので，スクリプトlyx2lyxが変換に失敗しました。"
#: src/Buffer.cpp:1258 src/Buffer.cpp:4169 src/Buffer.cpp:4232 #: src/Buffer.cpp:1258 src/Buffer.cpp:4169 src/Buffer.cpp:4232
msgid "File is read-only" msgid "File is read-only"
@ -22280,8 +22269,7 @@ msgstr ""
msgid "" msgid ""
"The LaTeX package cancel is only used if \\cancel commands are used in " "The LaTeX package cancel is only used if \\cancel commands are used in "
"formulas" "formulas"
msgstr "" msgstr "数式に\\cancelが挿入されたときに限り、LaTeXパッケージcancelが読み込まれます"
"数式に\\cancelが挿入されたときに限り、LaTeXパッケージcancelが読み込まれます"
#: src/BufferParams.cpp:458 #: src/BufferParams.cpp:458
msgid "" msgid ""
@ -22295,8 +22283,7 @@ msgstr ""
msgid "" msgid ""
"The LaTeX package mathdots is only used if the command \\iddots is inserted " "The LaTeX package mathdots is only used if the command \\iddots is inserted "
"into formulas" "into formulas"
msgstr "" msgstr "数式に\\iddotsが挿入されたときに限り、LaTeXパッケージmathdotsが読み込まれます"
"数式に\\iddotsが挿入されたときに限り、LaTeXパッケージmathdotsが読み込まれます"
#: src/BufferParams.cpp:462 #: src/BufferParams.cpp:462
msgid "" msgid ""
@ -23080,8 +23067,7 @@ msgstr "レイアウトが見つかりません"
#: src/CutAndPaste.cpp:753 #: src/CutAndPaste.cpp:753
#, c-format #, c-format
msgid "Flex inset %1$s is undefined after reloading `%2$s' layout." msgid "Flex inset %1$s is undefined after reloading `%2$s' layout."
msgstr "" msgstr "「%2$s」レイアウトを読み込み直したため自由差込枠%1$sは未定義になりました。"
"「%2$s」レイアウトを読み込み直したため自由差込枠%1$sは未定義になりました。"
#: src/CutAndPaste.cpp:756 #: src/CutAndPaste.cpp:756
#, c-format #, c-format
@ -23712,8 +23698,7 @@ msgstr ""
#: src/LyXRC.cpp:3143 #: src/LyXRC.cpp:3143
msgid "Define the options of the bibtex program for PLaTeX (Japanese LaTeX)." msgid "Define the options of the bibtex program for PLaTeX (Japanese LaTeX)."
msgstr "" msgstr "pLaTeX(日本語LaTeX)用のbibtexプログラムのオプションを定義してください。"
"pLaTeX(日本語LaTeX)用のbibtexプログラムのオプションを定義してください。"
#: src/LyXRC.cpp:3147 #: src/LyXRC.cpp:3147
msgid "" msgid ""
@ -23725,8 +23710,7 @@ msgstr ""
#: src/LyXRC.cpp:3151 #: src/LyXRC.cpp:3151
msgid "Select to check whether the lastfiles still exist." msgid "Select to check whether the lastfiles still exist."
msgstr "" msgstr "最後のファイルがまだ存在するかどうかをチェックするときには選んでください。"
"最後のファイルがまだ存在するかどうかをチェックするときには選んでください。"
#: src/LyXRC.cpp:3155 #: src/LyXRC.cpp:3155
msgid "" msgid ""
@ -23755,8 +23739,7 @@ msgstr ""
#: src/LyXRC.cpp:3177 #: src/LyXRC.cpp:3177
msgid "Make Apple key act as Meta and Control key as Ctrl." msgid "Make Apple key act as Meta and Control key as Ctrl."
msgstr "" msgstr "アップルキーをMetaキーとして、コントロールキーをCtrlキーとして動作させます。"
"アップルキーをMetaキーとして、コントロールキーをCtrlキーとして動作させます。"
#: src/LyXRC.cpp:3181 #: src/LyXRC.cpp:3181
msgid "Use the Mac OS X conventions for cursor movement" msgid "Use the Mac OS X conventions for cursor movement"
@ -23766,8 +23749,7 @@ msgstr "カーソル移動はMac OS Xの慣習に従う。"
msgid "" msgid ""
"Show a small box around a Math Macro with the macro name when the cursor is " "Show a small box around a Math Macro with the macro name when the cursor is "
"inside." "inside."
msgstr "" msgstr "カーソルが内部にある時に、数式マクロをマクロ名のついた小さなボックスで囲む。"
"カーソルが内部にある時に、数式マクロをマクロ名のついた小さなボックスで囲む。"
#: src/LyXRC.cpp:3190 #: src/LyXRC.cpp:3190
#, no-c-format #, no-c-format
@ -23811,8 +23793,7 @@ msgstr "LyX が画像をどのように表示するかを選びます。"
msgid "" msgid ""
"The default path for your documents. An empty value selects the directory " "The default path for your documents. An empty value selects the directory "
"LyX was started from." "LyX was started from."
msgstr "" msgstr "文書への既定パス。空の値は，LyX を開始したディレクトリを選ぶことになります。"
"文書への既定パス。空の値は，LyX を開始したディレクトリを選ぶことになります。"
#: src/LyXRC.cpp:3218 #: src/LyXRC.cpp:3218
msgid "Specify additional chars that can be part of a word." msgid "Specify additional chars that can be part of a word."
@ -23923,8 +23904,7 @@ msgstr ""
#: src/LyXRC.cpp:3290 #: src/LyXRC.cpp:3290
msgid "De-select if you do not want LyX to scroll to saved position." msgid "De-select if you do not want LyX to scroll to saved position."
msgstr "" msgstr "LyXが保存位置までスクロールしないようにしたいときは，非選択にしてください。"
"LyXが保存位置までスクロールしないようにしたいときは，非選択にしてください。"
#: src/LyXRC.cpp:3294 #: src/LyXRC.cpp:3294
msgid "De-select to prevent loading files opened from the last LyX session." msgid "De-select to prevent loading files opened from the last LyX session."
@ -23971,8 +23951,7 @@ msgstr "複数の補完候補がある際、遅延なしに補完ポップアッ
msgid "" msgid ""
"Show a small triangle on the cursor to indicate that a completion is " "Show a small triangle on the cursor to indicate that a completion is "
"available." "available."
msgstr "" msgstr "補完が利用可能であることを示すためにカーソル上に小さな三角形を表示します。"
"補完が利用可能であることを示すためにカーソル上に小さな三角形を表示します。"
#: src/LyXRC.cpp:3331 #: src/LyXRC.cpp:3331
msgid "The inline completion delay." msgid "The inline completion delay."
@ -23997,8 +23976,7 @@ msgstr "=>を\\Rightarrowに変換するなどのTeXMacs用簡略記法を許可
#: src/LyXRC.cpp:3351 #: src/LyXRC.cpp:3351
#, c-format #, c-format
msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu." msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu."
msgstr "" msgstr "最後に使ったファイルの最大表示数。%1$d までファイルメニューに表示できます。"
"最後に使ったファイルの最大表示数。%1$d までファイルメニューに表示できます。"
#: src/LyXRC.cpp:3362 #: src/LyXRC.cpp:3362
msgid "Shows a typeset preview of things such as math" msgid "Shows a typeset preview of things such as math"
@ -24328,8 +24306,7 @@ msgstr "未知のトークン"
msgid "" msgid ""
"You cannot insert a space at the beginning of a paragraph. Please read the " "You cannot insert a space at the beginning of a paragraph. Please read the "
"Tutorial." "Tutorial."
msgstr "" msgstr "空白を段落の先頭に挿入することはできません。LyX入門篇を読んでください。"
"空白を段落の先頭に挿入することはできません。LyX入門篇を読んでください。"
#: src/Text.cpp:1002 #: src/Text.cpp:1002
msgid "You cannot type two spaces this way. Please read the Tutorial." msgid "You cannot type two spaces this way. Please read the Tutorial."
@ -24465,8 +24442,7 @@ msgstr "破損ファイル"
#: src/TextClass.cpp:833 #: src/TextClass.cpp:833
msgid "Could not read stdinsets.inc! This may lead to data loss!" msgid "Could not read stdinsets.inc! This may lead to data loss!"
msgstr "" msgstr "stdinsets.incを読むことができません！データ喪失につながる可能性があります！"
"stdinsets.incを読むことができません！データ喪失につながる可能性があります！"
#: src/TextClass.cpp:1504 #: src/TextClass.cpp:1504
#, c-format #, c-format
@ -29268,8 +29244,7 @@ msgstr "LyXバイナリが見つかりません！"
#, c-format #, c-format
msgid "" msgid ""
"Unable to determine the path to the LyX binary from the command line %1$s" "Unable to determine the path to the LyX binary from the command line %1$s"
msgstr "" msgstr "コマンドライン %1$s からは、LyXバイナリへのパスを特定することができません。"
"コマンドライン %1$s からは、LyXバイナリへのパスを特定することができません。"
#: src/support/Package.cpp:629 #: src/support/Package.cpp:629
#, c-format #, c-format
@ -29502,8 +29477,7 @@ msgstr ""
msgid "" msgid ""
"It should be safe to continue, but you\n" "It should be safe to continue, but you\n"
"may wish to save your work and restart LyX." "may wish to save your work and restart LyX."
msgstr "" msgstr "続けても安全ですが、作業を保存してLyXを再起動するのが望ましいでしょう。"
"続けても安全ですが、作業を保存してLyXを再起動するのが望ましいでしょう。"
#: src/support/lassert.cpp:65 #: src/support/lassert.cpp:65
msgid "Warning!" msgid "Warning!"

9
src/BufferView.cpp
View File

@ -62,6 +62,8 @@
#include "insets/InsetRef.h" #include "insets/InsetRef.h"
#include "insets/InsetText.h" #include "insets/InsetText.h"
#include "mathed/MathData.h"
#include "frontends/alert.h" #include "frontends/alert.h"
#include "frontends/Application.h" #include "frontends/Application.h"
#include "frontends/Delegates.h" #include "frontends/Delegates.h"
@ -684,6 +686,10 @@ Change const BufferView::getCurrentChange() const
return Change(Change::UNCHANGED); return Change(Change::UNCHANGED);
DocIterator dit = d->cursor_.selectionBegin(); DocIterator dit = d->cursor_.selectionBegin();
// The selected content might have been changed (see #7685)
while (dit.inMathed())
// Find enclosing text cursor
dit.pop_back();
return dit.paragraph().lookupChange(dit.pos()); return dit.paragraph().lookupChange(dit.pos());
} }
@ -2494,7 +2500,8 @@ void BufferView::putSelectionAt(DocIterator const & cur,
bool BufferView::selectIfEmpty(DocIterator & cur) bool BufferView::selectIfEmpty(DocIterator & cur)
{ {
if (!cur.paragraph().empty()) if ((cur.inTexted() && !cur.paragraph().empty())
|| (cur.inMathed() && !cur.cell().empty()))
return false; return false;
pit_type const beg_pit = cur.pit(); pit_type const beg_pit = cur.pit();

6
src/Changes.cpp
View File

@ -397,6 +397,8 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
// close \lyxadded or \lyxdeleted // close \lyxadded or \lyxdeleted
os << '}'; os << '}';
column++; column++;
if (oldChange.type == Change::DELETED)
--runparams.inulemcmd;
} }
docstring chgTime; docstring chgTime;
@ -405,8 +407,10 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
chgTime.erase(chgTime.end() - 1); chgTime.erase(chgTime.end() - 1);
docstring macro_beg; docstring macro_beg;
if (change.type == Change::DELETED) if (change.type == Change::DELETED) {
macro_beg = from_ascii("\\lyxdeleted{"); macro_beg = from_ascii("\\lyxdeleted{");
++runparams.inulemcmd;
}
else if (change.type == Change::INSERTED) else if (change.type == Change::INSERTED)
macro_beg = from_ascii("\\lyxadded{"); macro_beg = from_ascii("\\lyxadded{");

2
src/CoordCache.cpp
View File

@ -38,7 +38,7 @@ void lyxbreaker(void const * data, const char * hint, int size)
{ {
LYXERR0("break on pointer: " << data << " hint: " << hint LYXERR0("break on pointer: " << data << " hint: " << hint
<< " size: " << size); << " size: " << size);
LASSERT(false, return); LBUFERR(false);
} }

16
src/Font.cpp
View File

@ -418,22 +418,22 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
if (f.underbar() == FONT_ON) { if (f.underbar() == FONT_ON) {
os << "\\uline{"; os << "\\uline{";
count += 10; count += 10;
runparams.inulemcmd = true; ++runparams.inulemcmd;
} }
if (f.strikeout() == FONT_ON) { if (f.strikeout() == FONT_ON) {
os << "\\sout{"; os << "\\sout{";
count += 9; count += 9;
runparams.inulemcmd = true; ++runparams.inulemcmd;
} }
if (f.uuline() == FONT_ON) { if (f.uuline() == FONT_ON) {
os << "\\uuline{"; os << "\\uuline{";
count += 11; count += 11;
runparams.inulemcmd = true; ++runparams.inulemcmd;
} }
if (f.uwave() == FONT_ON) { if (f.uwave() == FONT_ON) {
os << "\\uwave{"; os << "\\uwave{";
count += 10; count += 10;
runparams.inulemcmd = true; ++runparams.inulemcmd;
} }
return count; return count;
} }
@ -497,22 +497,22 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
if (f.underbar() == FONT_ON) { if (f.underbar() == FONT_ON) {
os << '}'; os << '}';
++count; ++count;
runparams.inulemcmd = false; --runparams.inulemcmd;
} }
if (f.strikeout() == FONT_ON) { if (f.strikeout() == FONT_ON) {
os << '}'; os << '}';
++count; ++count;
runparams.inulemcmd = false; --runparams.inulemcmd;
} }
if (f.uuline() == FONT_ON) { if (f.uuline() == FONT_ON) {
os << '}'; os << '}';
++count; ++count;
runparams.inulemcmd = false; --runparams.inulemcmd;
} }
if (f.uwave() == FONT_ON) { if (f.uwave() == FONT_ON) {
os << '}'; os << '}';
++count; ++count;
runparams.inulemcmd = false; --runparams.inulemcmd;
} }
// If the current language is Hebrew, Arabic, or Farsi // If the current language is Hebrew, Arabic, or Farsi

1
src/LyX.cpp
View File

@ -33,6 +33,7 @@
#include "FuncStatus.h" #include "FuncStatus.h"
#include "HunspellChecker.h" #include "HunspellChecker.h"
#include "KeyMap.h" #include "KeyMap.h"
#include "Language.h"
#include "LaTeXFonts.h" #include "LaTeXFonts.h"
#include "LayoutFile.h" #include "LayoutFile.h"
#include "Lexer.h" #include "Lexer.h"

2
src/OutputParams.cpp
View File

@ -20,7 +20,7 @@ namespace lyx {
OutputParams::OutputParams(Encoding const * enc) OutputParams::OutputParams(Encoding const * enc)
: flavor(LATEX), math_flavor(NotApplicable), nice(false), is_child(false), : flavor(LATEX), math_flavor(NotApplicable), nice(false), is_child(false),
moving_arg(false), inulemcmd(false), local_font(0), master_language(0), moving_arg(false), inulemcmd(0), local_font(0), master_language(0),
encoding(enc), free_spacing(false), use_babel(false), use_polyglossia(false), encoding(enc), free_spacing(false), use_babel(false), use_polyglossia(false),
use_indices(false), use_japanese(false), linelen(0), depth(0), use_indices(false), use_japanese(false), linelen(0), depth(0),
exportdata(new ExportData), exportdata(new ExportData),

4
src/OutputParams.h
View File

@ -99,13 +99,13 @@ public:
*/ */
bool intitle; bool intitle;
/** inulemcmd == true means that the environment in which the /** inulemcmd > 0 means that the environment in which the
inset is typeset is part of a ulem command (\uline, \uuline, inset is typeset is part of a ulem command (\uline, \uuline,
\uwave, or \sout). Insets that output latex commands relying \uwave, or \sout). Insets that output latex commands relying
on local assignments (such as \cite) should enclose such on local assignments (such as \cite) should enclose such
commands in \mbox{} in order to avoid breakage. commands in \mbox{} in order to avoid breakage.
*/ */
mutable bool inulemcmd; mutable int inulemcmd;
/** the font at the point where the inset is /** the font at the point where the inset is
*/ */

15
src/Paragraph.cpp
View File

@ -499,7 +499,7 @@ public:
TextContainer text_; TextContainer text_;
typedef set<docstring> Words; typedef set<docstring> Words;
typedef map<Language, Words> LangWordsMap; typedef map<string, Words> LangWordsMap;
/// ///
LangWordsMap words_; LangWordsMap words_;
/// ///
@ -3670,7 +3670,9 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
// process sequences of modified characters; in change // process sequences of modified characters; in change
// tracking mode, this approach results in much better // tracking mode, this approach results in much better
// usability than changing case on a char-by-char basis // usability than changing case on a char-by-char basis
docstring changes; // We also need to track the current font, since font
// changes within sequences can occur.
vector<pair<char_type, Font> > changes;
bool const trackChanges = bparams.trackChanges; bool const trackChanges = bparams.trackChanges;
@ -3704,7 +3706,7 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
} }
if (oldChar != newChar) { if (oldChar != newChar) {
changes += newChar; changes.push_back(make_pair(newChar, getFontSettings(bparams, pos)));
if (pos != right - 1) if (pos != right - 1)
continue; continue;
// step behind the changing area // step behind the changing area
@ -3713,9 +3715,8 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
int erasePos = pos - changes.size(); int erasePos = pos - changes.size();
for (size_t i = 0; i < changes.size(); i++) { for (size_t i = 0; i < changes.size(); i++) {
insertChar(pos, changes[i], insertChar(pos, changes[i].first,
getFontSettings(bparams, changes[i].second,
erasePos),
trackChanges); trackChanges);
if (!eraseChar(erasePos, trackChanges)) { if (!eraseChar(erasePos, trackChanges)) {
++erasePos; ++erasePos;
@ -3866,7 +3867,7 @@ void Paragraph::collectWords()
if (cit == d->fontlist_.end()) if (cit == d->fontlist_.end())
return; return;
Language const * lang = cit->font().language(); Language const * lang = cit->font().language();
d->words_[*lang].insert(word); d->words_[lang->lang()].insert(word);
} }
} }
} }

2
src/Text.cpp
View File

@ -2120,7 +2120,7 @@ bool Text::completionSupported(Cursor const & cur) const
CompletionList const * Text::createCompletionList(Cursor const & cur) const CompletionList const * Text::createCompletionList(Cursor const & cur) const
{ {
WordList const * list = theWordList(*cur.getFont().language()); WordList const * list = theWordList(cur.getFont().language()->lang());
return new TextCompletionList(cur, list); return new TextCompletionList(cur, list);
} }

14
src/WordList.cpp
View File

@ -12,14 +12,11 @@
#include "WordList.h" #include "WordList.h"
#include "Language.h"
#include "support/convert.h" #include "support/convert.h"
#include "support/debug.h" #include "support/debug.h"
#include "support/docstring.h" #include "support/docstring.h"
#include "support/weighted_btree.h"
#include "support/lassert.h" #include "support/lassert.h"
#include "support/weighted_btree.h"
#include <map> #include <map>
@ -28,12 +25,13 @@ using namespace std;
namespace lyx { namespace lyx {
/// ///
map<Language, WordList *> theGlobalWordList; typedef map<string, WordList *> GlobalWordList;
GlobalWordList theGlobalWordList;
WordList * theWordList(Language const & lang) WordList * theWordList(string const & lang)
{ {
map<Language, WordList *>::iterator it = theGlobalWordList.find(lang); GlobalWordList::iterator it = theGlobalWordList.find(lang);
if (it != theGlobalWordList.end()) if (it != theGlobalWordList.end())
return it->second; return it->second;
else else
@ -44,7 +42,7 @@ WordList * theWordList(Language const & lang)
void WordList::cleanupWordLists() void WordList::cleanupWordLists()
{ {
map<Language, WordList *>::const_iterator it = theGlobalWordList.begin(); GlobalWordList::const_iterator it = theGlobalWordList.begin();
for (; it != theGlobalWordList.end(); ++it) for (; it != theGlobalWordList.end(); ++it)
delete it->second; delete it->second;
theGlobalWordList.clear(); theGlobalWordList.clear();

4
src/WordList.h
View File

@ -14,8 +14,6 @@
#include "support/docstring.h" #include "support/docstring.h"
#include "Language.h"
namespace lyx { namespace lyx {
class WordList { class WordList {
@ -41,7 +39,7 @@ private:
Impl * d; Impl * d;
}; };
WordList * theWordList(Language const & lang); WordList * theWordList(std::string const & lang);
} // namespace lyx } // namespace lyx

2
src/frontends/qt4/GuiErrorList.cpp
View File

@ -188,7 +188,7 @@ bool GuiErrorList::goTo(int item)
return false; return false;
} }
// if pos_end is 0, this means it is end-of-paragraph // if pos_end is 0, this means it is end-of-paragraph
pos_type const s = dit.paragraph().size(); pos_type const s = dit.lastpos();
pos_type const end = err.pos_end ? min(err.pos_end, s) : s; pos_type const end = err.pos_end ? min(err.pos_end, s) : s;
pos_type const start = min(err.pos_start, end); pos_type const start = min(err.pos_start, end);
pos_type const range = end == start ? s - start : end - start; pos_type const range = end == start ? s - start : end - start;

12
src/frontends/qt4/GuiView.cpp
View File

@ -2115,6 +2115,18 @@ void GuiView::importDocument(string const & argument)
// get absolute path of file // get absolute path of file
FileName const fullname(support::makeAbsPath(filename)); FileName const fullname(support::makeAbsPath(filename));
// Can happen if the user entered a path into the dialog
// (see bug #7437)
if (fullname.onlyFileName().empty()) {
docstring msg = bformat(_("The file name '%1$s' is invalid!\n"
"Aborting import."),
from_utf8(fullname.absFileName()));
frontend::Alert::error(_("File name error"), msg);
message(_("Canceled."));
return;
}
FileName const lyxfile(support::changeExtension(fullname.absFileName(), ".lyx")); FileName const lyxfile(support::changeExtension(fullname.absFileName(), ".lyx"));
// Check if the document already is open // Check if the document already is open

7
src/frontends/qt4/TocWidget.cpp
View File

@ -187,9 +187,16 @@ void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd)
{ {
case LFUN_CHANGE_ACCEPT: case LFUN_CHANGE_ACCEPT:
case LFUN_CHANGE_REJECT: case LFUN_CHANGE_REJECT:
dispatch(item.action());
cur.dispatch(tmpcmd);
break;
case LFUN_SECTION_SELECT: case LFUN_SECTION_SELECT:
dispatch(item.action()); dispatch(item.action());
cur.dispatch(tmpcmd); cur.dispatch(tmpcmd);
// necessary to get the selection drawn.
cur.buffer()->changed(true);
gui_view_.setFocus();
break; break;
case LFUN_LABEL_COPY_AS_REFERENCE: { case LFUN_LABEL_COPY_AS_REFERENCE: {

211
src/frontends/qt4/ui/PrefCompletionUi.ui
View File

@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PrefCompletionUi</class> <class>PrefCompletionUi</class>
<widget class="QWidget" name="PrefCompletionUi" > <widget class="QWidget" name="PrefCompletionUi">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -9,54 +10,54 @@
<height>404</height> <height>404</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QGroupBox" name="groupBox_3" > <widget class="QGroupBox" name="groupBox_3">
<property name="title" > <property name="title">
<string>In Math</string> <string>In Math</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="margin" > <property name="spacing">
<number>9</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>9</number>
</property>
<item> <item>
<widget class="QCheckBox" name="inlineMathCB" > <widget class="QCheckBox" name="inlineMathCB">
<property name="toolTip" > <property name="toolTip">
<string>Show the grey inline completion behind the cursor in math mode after the delay.</string> <string>Show the grey inline completion behind the cursor in math mode after the delay.</string>
</property> </property>
<property name="text" > <property name="text">
<string>Automatic in&amp;line completion</string> <string>Automatic in&amp;line completion</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="popupMathCB" > <widget class="QCheckBox" name="popupMathCB">
<property name="toolTip" > <property name="toolTip">
<string>Show the popup in math mode after the delay.</string> <string>Show the popup in math mode after the delay.</string>
</property> </property>
<property name="text" > <property name="text">
<string>Automatic p&amp;opup</string> <string>Automatic p&amp;opup</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="autocorrectionCB" > <widget class="QCheckBox" name="autocorrectionCB">
<property name="text" > <property name="text">
<string>Autoco&amp;rrection</string> <string>Autoco&amp;rrection</string>
</property> </property>
</widget> </widget>
@ -64,47 +65,47 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QGroupBox" name="groupBox_2" > <widget class="QGroupBox" name="groupBox_2">
<property name="title" > <property name="title">
<string>In Text</string> <string>In Text</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="margin" > <property name="spacing">
<number>9</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>9</number>
</property>
<item> <item>
<widget class="QCheckBox" name="inlineTextCB" > <widget class="QCheckBox" name="inlineTextCB">
<property name="toolTip" > <property name="toolTip">
<string>Show the grey inline completion behind the cursor in text mode after the delay.</string> <string>Show the grey inline completion behind the cursor in text mode after the delay.</string>
</property> </property>
<property name="text" > <property name="text">
<string>Automatic &amp;inline completion</string> <string>Automatic &amp;inline completion</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="popupTextCB" > <widget class="QCheckBox" name="popupTextCB">
<property name="toolTip" > <property name="toolTip">
<string>Show the popup after the set delay in text mode.</string> <string>Show the popup after the set delay in text mode.</string>
</property> </property>
<property name="text" > <property name="text">
<string>Automatic &amp;popup</string> <string>Automatic &amp;popup</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="cursorTextCB" > <widget class="QCheckBox" name="cursorTextCB">
<property name="toolTip" > <property name="toolTip">
<string>Show a small triangle on the cursor if a completion is available in text mode.</string> <string>Show a small triangle on the cursor if a completion is available in text mode.</string>
</property> </property>
<property name="text" > <property name="text">
<string>Cursor i&amp;ndicator</string> <string>Cursor i&amp;ndicator</string>
</property> </property>
</widget> </widget>
@ -112,58 +113,58 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QGroupBox" name="groupBox_4" > <widget class="QGroupBox" name="groupBox_4">
<property name="title" > <property name="title">
<string>General</string> <string>General</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="margin" > <property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <item>
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item> <property name="margin">
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<widget class="QDoubleSpinBox" name="inlineDelaySB" > <widget class="QDoubleSpinBox" name="inlineDelaySB">
<property name="toolTip" > <property name="toolTip">
<string>After the cursor has not moved for this time, the inline completion is shown if it is available.</string> <string>After the cursor has not moved for this time, the inline completion is shown if it is available.</string>
</property> </property>
<property name="maximum" > <property name="maximum">
<double>10.000000000000000</double> <double>10.000000000000000</double>
</property> </property>
<property name="singleStep" > <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4">
<property name="text" > <property name="text">
<string>s inline completion dela&amp;y</string> <string>s inline completion dela&amp;y</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>inlineDelaySB</cstring> <cstring>inlineDelaySB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -174,42 +175,42 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="margin" > <property name="spacing">
<number>0</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QDoubleSpinBox" name="popupDelaySB" > <widget class="QDoubleSpinBox" name="popupDelaySB">
<property name="toolTip" > <property name="toolTip">
<string>After the cursor has not moved for this time, the completion popup is shown if it is available.</string> <string>After the cursor has not moved for this time, the completion popup is shown if it is available.</string>
</property> </property>
<property name="maximum" > <property name="maximum">
<double>10.000000000000000</double> <double>10.000000000000000</double>
</property> </property>
<property name="singleStep" > <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3">
<property name="text" > <property name="text">
<string>s popup d&amp;elay</string> <string>s popup d&amp;elay</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>popupDelaySB</cstring> <cstring>popupDelaySB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -220,17 +221,17 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="margin" > <property name="spacing">
<number>0</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QSpinBox" name="minlengthSB" > <widget class="QSpinBox" name="minlengthSB">
<property name="toolTip" > <property name="toolTip">
<string>.</string> <string>Words with less than the specified number of characters will not be completed.</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>5</number> <number>5</number>
@ -244,21 +245,21 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_5" > <widget class="QLabel" name="label_5">
<property name="text" > <property name="text">
<string>Minimum word length for completion</string> <string>Minimum characters for words that should be completed</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>minlengthSB</cstring> <cstring>minlengthSB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -269,37 +270,37 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="popupAfterCompleteCB" > <widget class="QCheckBox" name="popupAfterCompleteCB">
<property name="toolTip" > <property name="toolTip">
<string>When the TAB completion is not unique, there won't be a delay of the popup. It will be shown right away.</string> <string>When the TAB completion is not unique, there won't be a delay of the popup. It will be shown right away.</string>
</property> </property>
<property name="text" > <property name="text">
<string>Sho&amp;w popup without delay for non-unique completions</string> <string>Sho&amp;w popup without delay for non-unique completions</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="inlineDotsCB" > <widget class="QCheckBox" name="inlineDotsCB">
<property name="toolTip" > <property name="toolTip">
<string>Long completions are cut-off and shown with "...".</string> <string>Long completions are cut-off and shown with &quot;...&quot;.</string>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Use "..." to shorten long completions</string> <string>&amp;Use &quot;...&quot; to shorten long completions</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -318,7 +319,7 @@
<tabstop>autocorrectionCB</tabstop> <tabstop>autocorrectionCB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local" >qt_i18n.h</include> <include location="local">qt_i18n.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>

2
src/insets/InsetCitation.cpp
View File

@ -422,7 +422,7 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
// FIXME UNICODE // FIXME UNICODE
docstring const cite_str = from_utf8(citationStyleToString(cs)); docstring const cite_str = from_utf8(citationStyleToString(cs));
if (runparams.inulemcmd) if (runparams.inulemcmd > 0)
os << "\\mbox{"; os << "\\mbox{";
os << "\\" << cite_str; os << "\\" << cite_str;

30
src/insets/InsetListings.cpp
View File

@ -50,9 +50,6 @@ using namespace lyx::support;
namespace lyx { namespace lyx {
char const lstinline_delimiters[] =
"!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm";
InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par) InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par)
: InsetCollapsable(buf) : InsetCollapsable(buf)
{ {
@ -202,17 +199,18 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
code += "\n"; code += "\n";
} }
if (isInline) { if (isInline) {
char const * delimiter = lstinline_delimiters; static const docstring delimiters =
for (; *delimiter != '\0'; ++delimiter) from_utf8("!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm");
if (!contains(code, *delimiter))
break; size_t pos = delimiters.find_first_not_of(code);
// This code piece contains all possible special character? !!! // This code piece contains all possible special character? !!!
// Replace ! with a warning message and use ! as delimiter. // Replace ! with a warning message and use ! as delimiter.
if (*delimiter == '\0') { if (pos == string::npos) {
docstring delim_error = "<" + _("LyX Warning: ") docstring delim_error = "<" + _("LyX Warning: ")
+ _("no more lstline delimiters available") + ">"; + _("no more lstline delimiters available") + ">";
code = subst(code, from_ascii("!"), delim_error); code = subst(code, from_ascii("!"), delim_error);
delimiter = lstinline_delimiters; pos = 0;
if (!runparams.dryrun && !runparams.silent) { if (!runparams.dryrun && !runparams.silent) {
// FIXME: warning should be passed to the error dialog // FIXME: warning should be passed to the error dialog
frontend::Alert::warning(_("Running out of delimiters"), frontend::Alert::warning(_("Running out of delimiters"),
@ -223,12 +221,14 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
"must investigate!")); "must investigate!"));
} }
} }
if (param_string.empty()) docstring const delim(1, delimiters[pos]);
os << "\\lstinline" << *delimiter; os << "\\lstinline";
else if (!param_string.empty())
os << "\\lstinline[" << from_utf8(param_string) << "]" << *delimiter; os << "[" << from_utf8(param_string) << "]";
os << code else if (pos >= delimiters.find('Q'))
<< *delimiter; // We need to terminate the command before the delimiter
os << " ";
os << delim << code << delim;
} else { } else {
OutputParams rp = runparams; OutputParams rp = runparams;
rp.moving_arg = true; rp.moving_arg = true;

4
src/insets/InsetRef.cpp
View File

@ -143,7 +143,7 @@ void InsetRef::latex(otexstream & os, OutputParams const & rp) const
string const cmd = getCmdName(); string const cmd = getCmdName();
docstring const data = getEscapedLabel(rp); docstring const data = getEscapedLabel(rp);
if (rp.inulemcmd) if (rp.inulemcmd > 0)
os << "\\mbox{"; os << "\\mbox{";
if (cmd == "eqref" && buffer().params().use_refstyle) { if (cmd == "eqref" && buffer().params().use_refstyle) {
@ -168,7 +168,7 @@ void InsetRef::latex(otexstream & os, OutputParams const & rp) const
os << p.getCommand(rp); os << p.getCommand(rp);
} }
if (rp.inulemcmd) if (rp.inulemcmd > 0)
os << "}"; os << "}";
} }

3
src/lyxfind.cpp
View File

@ -1377,7 +1377,8 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
DocIterator sel_beg = cur.selectionBegin(); DocIterator sel_beg = cur.selectionBegin();
DocIterator sel_end = cur.selectionEnd(); DocIterator sel_end = cur.selectionEnd();
if (&sel_beg.inset() != &sel_end.inset() if (&sel_beg.inset() != &sel_end.inset()
|| sel_beg.pit() != sel_end.pit()) || sel_beg.pit() != sel_end.pit()
|| sel_beg.idx() != sel_end.idx())
return; return;
int sel_len = sel_end.pos() - sel_beg.pos(); int sel_len = sel_end.pos() - sel_beg.pos();
LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end

45
src/mathed/InsetMathHull.cpp
View File

@ -44,6 +44,7 @@
#include "insets/InsetRef.h" #include "insets/InsetRef.h"
#include "insets/RenderPreview.h" #include "insets/RenderPreview.h"
#include "graphics/GraphicsImage.h"
#include "graphics/PreviewImage.h" #include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.h" #include "graphics/PreviewLoader.h"
@ -410,7 +411,7 @@ ColorCode InsetMathHull::standardColor() const
} }
bool InsetMathHull::previewState(BufferView * bv) const bool InsetMathHull::previewState(const BufferView *const bv) const
{ {
if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON
&& type_ != hullRegexp) && type_ != hullRegexp)
@ -423,14 +424,24 @@ bool InsetMathHull::previewState(BufferView * bv) const
} }
namespace {
static const int ERROR_FRAME_WIDTH = 2;
}
void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
if (previewState(mi.base.bv)) { if (previewState(mi.base.bv)) {
preview_->metrics(mi, dim); preview_->metrics(mi, dim);
if (previewTooSmall(dim)) {
// preview image is too small
dim.wid += 2 * ERROR_FRAME_WIDTH;
dim.asc += 2 * ERROR_FRAME_WIDTH;
} else {
// insert a one pixel gap in front of the formula // insert a one pixel gap in front of the formula
dim.wid += 1; dim.wid += 1;
if (display()) if (display())
dim.des += displayMargin(); dim.des += displayMargin();
}
// Cache the inset dimension. // Cache the inset dimension.
setDimCache(mi, dim); setDimCache(mi, dim);
return; return;
@ -471,10 +482,21 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
} }
bool InsetMathHull::previewTooSmall(Dimension const & dim) const
{
return dim.width() <= 10 && dim.height() <= 10;
}
ColorCode InsetMathHull::backgroundColor(PainterInfo const & pi) const ColorCode InsetMathHull::backgroundColor(PainterInfo const & pi) const
{ {
if (previewState(pi.base.bv)) BufferView const * const bv = pi.base.bv;
if (previewState(bv)) {
Dimension const dim = dimension(*pi.base.bv);
if (previewTooSmall(dim))
return Color_error;
return graphics::PreviewLoader::backgroundColor(); return graphics::PreviewLoader::backgroundColor();
}
return Color_mathbg; return Color_mathbg;
} }
@ -482,23 +504,36 @@ ColorCode InsetMathHull::backgroundColor(PainterInfo const & pi) const
void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const
{ {
Dimension const dim = dimension(*pi.base.bv); Dimension const dim = dimension(*pi.base.bv);
if (previewTooSmall(dim)) {
pi.pain.fillRectangle(x, y - 2 * ERROR_FRAME_WIDTH,
dim.wid, dim.asc + dim.des, backgroundColor(pi));
return;
}
pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2, pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2,
dim.asc + dim.des - 1, pi.backgroundColor(this)); dim.asc + dim.des - 1, backgroundColor(pi));
} }
void InsetMathHull::draw(PainterInfo & pi, int x, int y) const void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
{ {
use_preview_ = previewState(pi.base.bv); BufferView const * const bv = pi.base.bv;
use_preview_ = previewState(bv);
if (type_ == hullRegexp) { if (type_ == hullRegexp) {
Dimension const dim = dimension(*pi.base.bv); Dimension const dim = dimension(*bv);
pi.pain.rectangle(x + 1, y - dim.ascent() + 1, pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
dim.width() - 2, dim.height() - 2, Color_regexpframe); dim.width() - 2, dim.height() - 2, Color_regexpframe);
} }
if (use_preview_) { if (use_preview_) {
Dimension const dim = dimension(*bv);
if (previewTooSmall(dim)) {
// we have an extra frame
preview_->draw(pi, x + ERROR_FRAME_WIDTH, y);
} else {
// one pixel gap in front // one pixel gap in front
preview_->draw(pi, x + 1, y); preview_->draw(pi, x + 1, y);
}
setPosCache(pi, x, y); setPosCache(pi, x, y);
return; return;
} }

4
src/mathed/InsetMathHull.h
View File

@ -271,7 +271,9 @@ protected:
/// ///
void handleFont2(Cursor & cur, docstring const & arg); void handleFont2(Cursor & cur, docstring const & arg);
/// ///
bool previewState(BufferView * bv) const; bool previewState(BufferView const * const bv) const;
///
bool previewTooSmall(Dimension const & dim) const;
}; };

1
src/mathed/InsetMathNest.cpp
View File

@ -736,6 +736,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
cur.setSelection(true); cur.setSelection(true);
cur.idx() = cur.lastidx(); cur.idx() = cur.lastidx();
cur.pos() = cur.lastpos(); cur.pos() = cur.lastpos();
cur.bv().cursor() = cur;
break; break;
case LFUN_PARAGRAPH_UP: case LFUN_PARAGRAPH_UP:

114
status.21x Normal file
View File

@ -0,0 +1,114 @@
-*- text -*-
This file describes what has been done in the preparation of LyX 2.1.1.
All comments are welcome.
We try to group things by topic and in decreasing order of importance.
Please feel free to re-arrange if that seems like a good idea.
All of these fixes have already been checked into the 2.1.x branch of
LyX's git repository. The repository can be cloned via:
git clone git://git.lyx.org/lyx
For more details on how to use the repository, please visit:
http://wiki.lyx.org/Devel/LyXGit
A list of bugs fixed for this release can also be found at:
http://www.lyx.org/trac/wiki/BugTrackerHome
as well as a list of bugs still targeted to the 2.1.1 release.
Richard Heck
Branch Maintainer
rgheck@lyx.org
What's new
==========
** Updates:
***********
* DOCUMENT INPUT/OUTPUT
* TEX2LYX IMPROVEMENTS
* USER INTERFACE
* DOCUMENTATION AND LOCALIZATION
* BUILD/INSTALLATION
** Bug fixes:
*************
* DOCUMENT INPUT/OUTPUT
- Fix LaTeX error with alphabetic delimiters in inline Listings (part of bug
8985).
- Fix output of deleted citations in change tracking mode (bug 8806).
* USER INTERFACE
- Fix crash when entering math in change-tracking mode while merge changes
dialog is open (bug 7685).
- Fix crash when CheckTeX hits mathed (bug 8798).
- Fix crash when performing "Change Case" operation on a selection with font
changes (bug 7943).
- Fix assertion when entering a path into the import dialog (bug 7437).
- Fix assertion when doing advanced replace with table cells selected (bug
7944).
- Failed instant preview compilation now returns an error. And a red box is
drawn around very small preview imagines, so they can be seen (bug 7522).
- Fix "Select Section" function in the Outliner (bug 8936).
- Fix select-by-doubleclick in mathed (bug 8829).
* INTERNALS
- Fix a problem when PATH changes and python command is relative (bug 8950).
- Reduce memory use with large documents.
* DOCUMENTATION AND LOCALIZATION
* LYXHTML
* TEX2LYX
* ADVANCED FIND AND REPLACE
* BUILD/INSTALLATION
- Fix bad compare of pointer vs. character (part of bug 8985).
- With autotools, avoid installing in Windows and MacOS some files intented
for the unix builds.